[ar71xx] fix dir-825-b1 default network config after r21905

[openwrt.git] / package / madwifi / patches / 324-alignment.patch

diff --git a/package/madwifi/patches/324-alignment.patch b/package/madwifi/patches/324-alignment.patch
index 108f0c6..c01135f 100644 (file)
--- a/package/madwifi/patches/324-alignment.patch
+++ b/package/madwifi/patches/324-alignment.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3280/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 @@
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
+@@ -1275,14 +1275,8 @@ ieee80211_decap(struct ieee80211vap *vap

                eh->ether_type = ether_type;
  
        if (!ALIGNED_POINTER(skb->data + sizeof(*eh), u_int32_t)) {
                eh->ether_type = ether_type;
  
        if (!ALIGNED_POINTER(skb->data + sizeof(*eh), u_int32_t)) {


@@ -10,11 +8,8 @@ Index: madwifi-trunk-r3280/net80211/ieee80211_input.c
 -
 -              /* XXX: does this always work? */
 -              tskb = skb_copy(skb, GFP_ATOMIC);
 -
 -              /* 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);
 -              ieee80211_dev_kfree_skb(&skb);
 -              skb = tskb;
 +              memmove(skb->data - 2, skb->data, skb->len);