Changeset 4177

Show
Ignore:
Timestamp:
01/30/12 20:55:03 (4 months ago)
Author:
proski
Message:

Don't reference vlan_group without IEEE80211_VLAN_TAG_USED set

struct vlan_group will be removed in Linux 3.3.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • madwifi/trunk/net80211/ieee80211_linux.h

    r4163 r4177  
    644644struct ieee80211vap *ieee80211_create_vap(struct ieee80211com *, char *, 
    645645        struct net_device *, int, int); 
     646 
     647#if IEEE80211_VLAN_TAG_USED 
    646648void ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp); 
    647649void ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid); 
    648650void ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid); 
     651#endif 
    649652 
    650653#endif /* _NET80211_IEEE80211_LINUX_H_ */ 

  • madwifi/trunk/net80211/ieee80211_skb.h

    r3743 r4177  
    114114#ifdef IEEE80211_DEBUG_REFCNT 
    115115 
     116#if IEEE80211_VLAN_TAG_USED 
    116117int vlan_hwaccel_rx_debug(struct sk_buff *skb, struct vlan_group *grp, 
    117118                unsigned short vlan_tag, const char *func, int line); 
     119#endif 
    118120int netif_rx_debug(struct sk_buff *skb, const char *func, int line); 
    119121struct sk_buff *alloc_skb_debug(unsigned int length, gfp_t gfp_mask,