Changeset 3595

Timestamp:

05/03/08 05:49:05 (8 months ago)

Author:

mentor

Message:

Remove the skb_copy call from ieee80211_input. However, create a copied SKB for each call to ieee80211_input when we are sending to all VAPs. Effectively, this means that we are using the SKB from the ath_buf except when ieee80211_input is called multiple times.

Files:

• madwifi/trunk/ath/if_ath.c (modified) (1 diff)
• madwifi/trunk/net80211/ieee80211_input.c (modified) (5 diffs)

madwifi/trunk/ath/if_ath.c

@@ -6850 +6850 @@
-                } else {
-                        struct ieee80211vap *vap;
+                        struct sk_buff *tskb;
-                        /* Create a new SKB copy for each VAP except the last
-                         * one, which gets the original SKB. */
-                        TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
+                                if (vap == TAILQ_LAST(&ic->ic_vaps,
+                                                        ieee80211vap_headtype))
+                                        tskb = skb;
+                                else
+                                        tskb = skb_copy(skb, GFP_ATOMIC);
+
+                                if (!tskb)
+                                        /* XXX: Brilliant OOM handling. */
+                                        vap->iv_devstats.tx_dropped++;
+                                else
-                                        type = ieee80211_input(vap, NULL, skb,
-                                                        rs->rs_rssi, bf->bf_tsf);

madwifi/trunk/net80211/ieee80211_input.c

@@ -196 +196 @@
-int
-ieee80211_input(struct ieee80211vap * vap, struct ieee80211_node *ni_or_null,
-original_
+
-{
-#define HAS_SEQ(type)   ((type & 0x4) == 0)
@@ -205 +205 @@
-        struct ieee80211_key *key;
-        struct ether_header *eh;
-        struct sk_buff *skb = NULL;
-#ifdef ATH_SUPERG_FF
-        struct llc *llc;
@@ -221 +220 @@
-                ni = ieee80211_ref_node(vap->iv_bss);
-        }
-original_
+
-        KASSERT(ni != NULL, ("null node"));
-        ni->ni_inact = ni->ni_inact_reload;
@@ -231 +230 @@
-        if (vap->iv_opmode == IEEE80211_M_MONITOR)
-                goto out;
-original_
+
-                IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
-                        ni->ni_macaddr, NULL,
-original_
+
-                vap->iv_stats.is_rx_tooshort++;
-                goto out;
-        }
-        /* Copy the SKB... we assume somewhere in this driver that we 'own'
-         * the skbuff passed into hard start and we do a lot of messing with it
-         * but bridges under some cases will not clone for the first pass of skb
-         * to a bridge port, but will then clone for subsequent ones.  This is 
-         * odd behavior but it means that if we have trashed the skb we are given
-         * then other ports get clones of the residual garbage. */
-        if ((skb = skb_copy(original_skb, GFP_ATOMIC)) == NULL) {
-                vap->iv_devstats.tx_dropped++;
-                original_skb = NULL; /* protect caller's skb */
-                goto out;
-        }
-        ieee80211_skb_copy_noderef(original_skb, skb);
-        original_skb = NULL; /* protect caller's skb */
-
-        /* Bit of a cheat here, we use a pointer for a 3-address
@@ -854 +840 @@
-        vap->iv_devstats.rx_errors++;
-out:
-
-
+
-        if (ni_or_null == NULL)
-                ieee80211_unref_node(&ni);