diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-01-28 18:34:06 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-01-28 18:34:06 +0000 |
| commit | d9ad14d717c122ed6f643e2445acdfeeb6a04e98 (patch) | |
| tree | 5b27ea56f984ace688fc88b203418aebe4e9a695 /package/madwifi/patches/316-skb_checks.patch | |
| parent | 5f713d6adb6eea0707716abb51455489282150cf (diff) | |
| download | upstream-d9ad14d717c122ed6f643e2445acdfeeb6a04e98.tar.gz upstream-d9ad14d717c122ed6f643e2445acdfeeb6a04e98.tar.bz2 upstream-d9ad14d717c122ed6f643e2445acdfeeb6a04e98.zip | |
update madwifi to latest trunk, include a few more fixes/improvements
SVN-Revision: 10294
Diffstat (limited to 'package/madwifi/patches/316-skb_checks.patch')
| -rw-r--r-- | package/madwifi/patches/316-skb_checks.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/madwifi/patches/316-skb_checks.patch b/package/madwifi/patches/316-skb_checks.patch index de6d551e51..8457bc3dc0 100644 --- a/package/madwifi/patches/316-skb_checks.patch +++ b/package/madwifi/patches/316-skb_checks.patch @@ -1,7 +1,7 @@ -Index: madwifi-dfs-r3252/net80211/ieee80211_input.c +Index: madwifi-trunk-r3280/net80211/ieee80211_input.c =================================================================== ---- madwifi-dfs-r3252.orig/net80211/ieee80211_input.c 2008-01-26 05:14:46.815962139 +0100 -+++ madwifi-dfs-r3252/net80211/ieee80211_input.c 2008-01-26 05:18:37.005079863 +0100 +--- madwifi-trunk-r3280.orig/net80211/ieee80211_input.c 2008-01-28 17:36:55.186089457 +0100 ++++ madwifi-trunk-r3280/net80211/ieee80211_input.c 2008-01-28 17:38:42.816222949 +0100 @@ -740,8 +740,10 @@ skb1 = skb_copy(skb, GFP_ATOMIC); @@ -15,7 +15,7 @@ Index: madwifi-dfs-r3252/net80211/ieee80211_input.c /* we now have 802.3 MAC hdr followed by 802.2 LLC/SNAP; convert to EthernetII. * Note that the frame is at least IEEE80211_MIN_LEN, due to the driver code. */ -@@ -1055,9 +1057,11 @@ +@@ -1056,9 +1058,11 @@ * assemble fragments */ ni->ni_rxfrag = skb_copy(skb, GFP_ATOMIC); @@ -30,7 +30,7 @@ Index: madwifi-dfs-r3252/net80211/ieee80211_input.c } /* * Check that we have enough space to hold -@@ -1071,7 +1075,7 @@ +@@ -1072,7 +1076,7 @@ (skb_end_pointer(skb) - skb->head), GFP_ATOMIC); /* We duplicate the reference after skb_copy */ @@ -39,17 +39,17 @@ Index: madwifi-dfs-r3252/net80211/ieee80211_input.c ieee80211_skb_copy_noderef(skb, ni->ni_rxfrag); ieee80211_dev_kfree_skb(&skb); } -@@ -1134,7 +1138,8 @@ +@@ -1135,7 +1139,8 @@ if (ETHER_IS_MULTICAST(eh->ether_dhost)) { + /* Create a SKB for the BSS to send out. */ skb1 = skb_copy(skb, GFP_ATOMIC); - /* Use the BSS node for retransmitting this multicast frame */ - SKB_CB(skb1)->ni = ieee80211_ref_node(vap->iv_bss); + if (skb1) + SKB_CB(skb1)->ni = ieee80211_ref_node(vap->iv_bss); } else { /* -@@ -1277,6 +1282,9 @@ +@@ -1278,6 +1283,9 @@ /* XXX: does this always work? */ tskb = skb_copy(skb, GFP_ATOMIC); |