diff options
author | Felix Fietkau <nbd@openwrt.org> | 2008-01-31 04:09:54 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2008-01-31 04:09:54 +0000 |
commit | 35bf3bbf34d829ad6b0c3e579b5f015e0f5634d6 (patch) | |
tree | ae93ee0c53be3ebca6d754d337bb62e131b80bae /package/madwifi/patches/324-alignment.patch | |
parent | f6f798feeb91735bb7e59e542629abada01fd229 (diff) | |
download | upstream-35bf3bbf34d829ad6b0c3e579b5f015e0f5634d6.tar.gz upstream-35bf3bbf34d829ad6b0c3e579b5f015e0f5634d6.tar.bz2 upstream-35bf3bbf34d829ad6b0c3e579b5f015e0f5634d6.zip |
pull madwifi forward to the latest upstream version - should fix some dual radio issues; add preliminary 2.6.24 support patch (compiles, not run-time tested, thx SeG)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10334 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi/patches/324-alignment.patch')
-rw-r--r-- | package/madwifi/patches/324-alignment.patch | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/package/madwifi/patches/324-alignment.patch b/package/madwifi/patches/324-alignment.patch index 108f0c6137..bd8547b88f 100644 --- a/package/madwifi/patches/324-alignment.patch +++ b/package/madwifi/patches/324-alignment.patch @@ -1,8 +1,8 @@ -Index: madwifi-trunk-r3280/net80211/ieee80211_input.c +Index: madwifi-trunk-r3314/net80211/ieee80211_input.c =================================================================== ---- madwifi-trunk-r3280.orig/net80211/ieee80211_input.c 2008-01-28 18:38:05.794780412 +0100 -+++ madwifi-trunk-r3280/net80211/ieee80211_input.c 2008-01-28 18:38:21.835694529 +0100 -@@ -1279,17 +1279,8 @@ +--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-01-31 03:33:26.665309039 +0100 ++++ madwifi-trunk-r3314/net80211/ieee80211_input.c 2008-01-31 03:38:55.116026377 +0100 +@@ -1275,14 +1275,8 @@ eh->ether_type = ether_type; if (!ALIGNED_POINTER(skb->data + sizeof(*eh), u_int32_t)) { @@ -10,11 +10,8 @@ Index: madwifi-trunk-r3280/net80211/ieee80211_input.c - - /* XXX: does this always work? */ - tskb = skb_copy(skb, GFP_ATOMIC); -- if (!tskb) -- return skb; -- -- /* We duplicate the reference after skb_copy */ -- ieee80211_skb_copy_noderef(skb, tskb); +- if (tskb) +- ieee80211_skb_copy_noderef(skb, tskb); - ieee80211_dev_kfree_skb(&skb); - skb = tskb; + memmove(skb->data - 2, skb->data, skb->len); |