diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-29 12:52:16 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-29 12:52:16 +0000 |
commit | 76490c76f8ad5b7127cc8e59efeacef8b7c2adb3 (patch) | |
tree | 82e3d717be8edc4b0a0ea93e02911b934e591025 /package/madwifi/patches/478-remove_vlan_code.patch | |
parent | 0bc9af31a9987ac2fd62491b642dae63a3f3eb2a (diff) |
madwifi: fix compile issues with linux 3.1/3.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31138 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi/patches/478-remove_vlan_code.patch')
-rw-r--r-- | package/madwifi/patches/478-remove_vlan_code.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/package/madwifi/patches/478-remove_vlan_code.patch b/package/madwifi/patches/478-remove_vlan_code.patch new file mode 100644 index 0000000000..9ceda4aa0a --- /dev/null +++ b/package/madwifi/patches/478-remove_vlan_code.patch @@ -0,0 +1,21 @@ +--- a/net80211/ieee80211_input.c ++++ b/net80211/ieee80211_input.c +@@ -1223,6 +1223,7 @@ ieee80211_deliver_data(struct ieee80211_ + #endif + vap->iv_devstats.rx_packets++; + vap->iv_devstats.rx_bytes += skb->len; ++#if IEEE80211_VLAN_TAG_USED + if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) { + /* attach vlan tag */ + struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni; +@@ -1236,7 +1237,9 @@ ieee80211_deliver_data(struct ieee80211_ + vap->iv_devstats.rx_dropped++; + } + skb = NULL; /* SKB is no longer ours */ +- } else { ++ } else ++#endif ++ { + struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni; + if (netif_receive_skb(skb) == NET_RX_DROP) { + /* If netif_receive_skb dropped the packet because |