Branch oldpackages for 14.07
[14.07/packages.git] / net / madwifi / patches / 478-remove_vlan_code.patch
1 --- a/net80211/ieee80211_input.c
2 +++ b/net80211/ieee80211_input.c
3 @@ -1223,6 +1223,7 @@ ieee80211_deliver_data(struct ieee80211_
4  #endif
5                 vap->iv_devstats.rx_packets++;
6                 vap->iv_devstats.rx_bytes += skb->len;
7 +#if IEEE80211_VLAN_TAG_USED
8                 if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) {
9                         /* attach vlan tag */
10                         struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni;
11 @@ -1236,7 +1237,9 @@ ieee80211_deliver_data(struct ieee80211_
12                                 vap->iv_devstats.rx_dropped++;
13                         }
14                         skb = NULL; /* SKB is no longer ours */
15 -               } else {
16 +               } else
17 +#endif
18 +               {
19                         struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni;
20                         if (netif_receive_skb(skb) == NET_RX_DROP) {
21                                 /* If netif_receive_skb dropped the packet because