mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2025-02-20 01:05:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3595 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
mentor 2008-05-03 03:49:05 +00:00
parent 1b318d3853
commit 9538bc8243
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ath/if_ath.c
View File

@ -6849,9 +6849,20 @@ drop_micfail:
ieee80211_unref_node(&ni);
} 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);
}

25
net80211/ieee80211_input.c
View File

@ -195,7 +195,7 @@ iwspy_event(struct ieee80211vap *vap, struct ieee80211_node *ni, u_int rssi)
*/
int
ieee80211_input(struct ieee80211vap * vap, struct ieee80211_node *ni_or_null,
struct sk_buff *original_skb, int rssi, u_int64_t rtsf)
struct sk_buff *skb, int rssi, u_int64_t rtsf)
{
#define HAS_SEQ(type) ((type & 0x4) == 0)
struct ieee80211_node * ni = ni_or_null;
@ -204,7 +204,6 @@ ieee80211_input(struct ieee80211vap * vap, struct ieee80211_node *ni_or_null,
struct ieee80211_frame *wh;
struct ieee80211_key *key;
struct ether_header *eh;
struct sk_buff *skb = NULL;
#ifdef ATH_SUPERG_FF
struct llc *llc;
#endif
@ -220,7 +219,7 @@ ieee80211_input(struct ieee80211vap * vap, struct ieee80211_node *ni_or_null,
* briefly grab our own reference. */
ni = ieee80211_ref_node(vap->iv_bss);
}
KASSERT(original_skb != NULL, ("null skb"));
KASSERT(skb != NULL, ("null skb"));
KASSERT(ni != NULL, ("null node"));
ni->ni_inact = ni->ni_inact_reload;
type = -1; /* undefined */
@ -230,26 +229,13 @@ ieee80211_input(struct ieee80211vap * vap, struct ieee80211_node *ni_or_null,
* XXX: may want to include the CRC. */
if (vap->iv_opmode == IEEE80211_M_MONITOR)
goto out;
if (original_skb->len < sizeof(struct ieee80211_frame_min)) {
if (skb->len < sizeof(struct ieee80211_frame_min)) {
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
ni->ni_macaddr, NULL,
"too short (1): len %u", original_skb->len);
"too short (1): len %u", skb->len);
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
* frame format but don't reference fields past outside
@ -853,8 +839,7 @@ ieee80211_input(struct ieee80211vap * vap, struct ieee80211_node *ni_or_null,
err:
vap->iv_devstats.rx_errors++;
out:
if (skb != NULL)
ieee80211_dev_kfree_skb(&skb); /* This is a copy! */
ieee80211_dev_kfree_skb(&skb);
if (ni_or_null == NULL)
ieee80211_unref_node(&ni);
return type;