Ticket #1096: simplify_ni_rxfrag_2.diff

net80211/ieee80211_node.c

@@ -759 +759 @@
-static void
-node_cleanup(struct ieee80211_node *ni)
-{
-#define N(a)    (sizeof(a)/sizeof(a[0]))
-        struct ieee80211vap *vap = ni->ni_vap;
-        int i;
-
-        /* NB: preserve ni_table */
-        if (ni->ni_flags & IEEE80211_NODE_PWR_MGT) {
@@ -810 +808 @@
-         *
-         * XXX does this leave us open to inheriting old state?
-         */
-
-       if (ni->ni_rxfrag[i]
-       dev_kfree_skb_any(ni->ni_rxfrag[i]
-       ni->ni_rxfrag[i]
-       
+
+if (ni->ni_rxfrag
+dev_kfree_skb_any(ni->ni_rxfrag
+ni->ni_rxfrag
+
-        ieee80211_crypto_delkey(vap, &ni->ni_ucastkey, ni);
-        ni->ni_rxkeyoff = 0;
-#undef N
-}
-
-static void
@@ -859 +856 @@
-        struct ieee80211com *ic = nt->nt_ic;
-        struct ieee80211_node *ni;
-        int hash;
-        int i;
-
-        ni = ic->ic_node_alloc(nt, vap);
-        if (ni == NULL) {
@@ -892 +888 @@
-        ni->ni_table = nt;
-        TAILQ_INSERT_TAIL(&nt->nt_node, ni, ni_list);
-        LIST_INSERT_HEAD(&nt->nt_hash[hash], ni, ni_hash);
-
-
-
-
+
-        ni->ni_challenge = NULL;
-        IEEE80211_NODE_UNLOCK_IRQ(nt);
-
@@ -1019 +1012 @@
-{
-        struct ieee80211com *ic = vap->iv_ic;
-        struct ieee80211_node *ni;
-        int i;
-
-        ni = ic->ic_node_alloc(&ic->ic_sta,vap);
-        if (ni != NULL) {
@@ -1041 +1033 @@
-
-                ni->ni_table = NULL;            /* NB: pedantic */
-                ni->ni_ic = ic;
-
-
-
-
+
-                ni->ni_challenge = NULL;
-        } else {
-                /* XXX msg */
@@ -1061 +1050 @@
-{
-        struct ieee80211com *ic = vap->iv_ic;
-        struct ieee80211_node *ni;
-        int i;
-
-        ni = ieee80211_alloc_node(&ic->ic_sta, vap, macaddr);
-        if (ni != NULL) {
@@ -1074 +1062 @@
-                IEEE80211_ADDR_COPY(ni->ni_bssid, vap->iv_bss->ni_bssid);
-                ieee80211_node_set_chan(ic, ni);
-                ni->ni_rsn = vap->iv_bss->ni_rsn;
-
-
-
-
+
-        }
-        return ni;
-}
@@ -1562 +1547 @@
-                 * (last fragment older than 1s).
-                 * XXX doesn't belong here
-                 */
-[0]
+
-                    jiffies > ni->ni_rxfragstamp + HZ) {
-[0]
-[0]
+
+
-                }
-                /*
-                 * Special case ourself; we may be idle for extended periods

net80211/ieee80211_node.h

@@ -129 +129 @@
-        u_int16_t ni_txseqs[17];                        /* tx seq per-tid */
-        u_int16_t ni_rxseqs[17];                        /* rx seq previous per-tid*/
-        u_int32_t ni_rxfragstamp;               /* time stamp of last rx frag */
-[3]
+
-        struct ieee80211_rsnparms ni_rsn;       /* RSN/WPA parameters */
-        struct ieee80211_key ni_ucastkey;       /* unicast key */
-        int ni_rxkeyoff;                        /* Receive key offset */

net80211/ieee80211_input.c

@@ -959 +959 @@
-        fragno = le16_to_cpu(*(__le16 *)wh->i_seq) & IEEE80211_SEQ_FRAG_MASK;
-
-        /* Quick way out, if there's nothing to defragment */
-[0]
+
-                return skb;
-
-        /*
@@ -980 +980 @@
-        }
-
-        /*
-[0]
+
-         * not freed by the timer process while we use it.
-         * XXX bogus
-         */
@@ -989 +989 @@
-        /*
-         * Update the time stamp.  As a side effect, it
-         * also makes sure that the timer will not change
-[0]
+
-         * other words, for the remaining of this function.
-         */
-        ni->ni_rxfragstamp = jiffies;
@@ -1000 +1000 @@
-         * Validate that fragment is in order and
-         * related to the previous ones.
-         */
-[0]
+
-                struct ieee80211_frame *lwh;
-
-[0]
+
-                last_rxseq = le16_to_cpu(*(__le16 *)lwh->i_seq) >>
-                        IEEE80211_SEQ_SEQ_SHIFT;
-                last_fragno = le16_to_cpu(*(__le16 *)lwh->i_seq) &
@@ -1012 +1012 @@
-                    || fragno != last_fragno + 1
-                    || (!IEEE80211_ADDR_EQ(wh->i_addr1, lwh->i_addr1))
-                    || (!IEEE80211_ADDR_EQ(wh->i_addr2, lwh->i_addr2))
-[0]->end - ni->ni_rxfrag[0]
+->end - ni->ni_rxfrag
-                        skb->len)) {
-                        /*
-                         * Unrelated fragment or no space for it,
-                         * clear current fragments
-                         */
-[0]
-[0]
+
+
-                }
-        }
-
-        /* If this is the first fragment */
-[0]
-[0]
+
+
-                /* If more frags are coming */
-                if (more_frag) {
-                        if (skb_is_nonlinear(skb)) {
@@ -1033 +1033 @@
-                                 * We need a continous buffer to
-                                 * assemble fragments
-                                 */
-[0]
+
-                                dev_kfree_skb(skb);
-                        }
-                        /*
@@ -1043 +1043 @@
-                         */
-                        else if (skb->end - skb->head < ni->ni_vap->iv_dev->mtu +
-                                 hdrlen) {
-[0]
+
-                                        (ni->ni_vap->iv_dev->mtu + hdrlen) -
-                                        (skb->end - skb->head), GFP_ATOMIC);
-                                dev_kfree_skb(skb);
-                        }
-                }
-        } else {
-[0]
+
-                        struct ieee80211_frame *lwh = (struct ieee80211_frame *)
-[0]
+
-
-                        /*
-                         * We know we have enough space to copy,
-                         * we've verified that before
-                         */
-                        /* Copy current fragment at end of previous one */
-[0]
+
-                               skb->data + hdrlen, skb->len - hdrlen);
-                        /* Update tail and length */
-[0]
+
-                        /* Keep a copy of last sequence and fragno */
-                        *(__le16 *) lwh->i_seq = *(__le16 *) wh->i_seq;
-                }
@@ -1075 +1075 @@
-                skb = NULL;
-        } else {
-                /* Last fragment received, we're done! */
-[0]
-[0]
+
+
-        }
-        return skb;
-}