Show
Ignore:
Timestamp:
07/04/09 05:10:46 (3 years ago)
Author:
proski
Message:

Merge r4022, r4059 and r4061 from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • madwifi/branches/madwifi-hal-testing/net80211/ieee80211_linux.h

    r4003 r4068  
    637637struct ieee80211vap *ieee80211_create_vap(struct ieee80211com *, char *, 
    638638        struct net_device *, int, int); 
     639void ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp); 
     640void ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid); 
     641void ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid); 
     642 
    639643#endif /* _NET80211_IEEE80211_LINUX_H_ */