1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-16 22:56:14 +02:00
openwrt-xburst/package/madwifi/patches/478-remove_vlan_code.patch
nbd 76490c76f8 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
2012-03-29 12:52:16 +00:00

22 lines
715 B
Diff

--- 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