mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2024-11-22 06:21:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Compile fix with VLAN support on recent kernels

Browse Source 
VLAN operations should be in net_device_ops.


git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4059 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2009-06-25 22:22:58 +00:00
parent 2d0ca57ecd
commit 530d6494db
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net80211/ieee80211.c
View File

@ -409,6 +409,11 @@ static const struct net_device_ops ieee80211_netdev_ops = {
.ndo_set_multicast_list = ieee80211_set_multicast_list, .ndo_set_multicast_list = ieee80211_set_multicast_list,
.ndo_change_mtu = ieee80211_change_mtu, .ndo_change_mtu = ieee80211_change_mtu,
.ndo_do_ioctl = ieee80211_ioctl, .ndo_do_ioctl = ieee80211_ioctl,
#if IEEE80211_VLAN_TAG_USED
.ndo_vlan_rx_register = ieee80211_vlan_register,
.ndo_vlan_rx_add_vid = ieee80211_vlan_add_vid,
.ndo_vlan_rx_kill_vid = ieee80211_vlan_kill_vid,
#endif
}; };
#endif #endif
@ -441,6 +446,11 @@ ieee80211_vap_setup(struct ieee80211com *ic, struct net_device *dev,
dev->set_multicast_list = ieee80211_set_multicast_list; dev->set_multicast_list = ieee80211_set_multicast_list;
dev->change_mtu = ieee80211_change_mtu; dev->change_mtu = ieee80211_change_mtu;
dev->do_ioctl = ieee80211_ioctl; dev->do_ioctl = ieee80211_ioctl;
#if IEEE80211_VLAN_TAG_USED
dev->vlan_rx_register = ieee80211_vlan_register;
dev->vlan_rx_add_vid = ieee80211_vlan_add_vid;
dev->vlan_rx_kill_vid = ieee80211_vlan_kill_vid;
#endif
#else #else
dev->netdev_ops = &ieee80211_netdev_ops; dev->netdev_ops = &ieee80211_netdev_ops;
#endif #endif

9
net80211/ieee80211_linux.c
View File

@ -178,7 +178,7 @@ EXPORT_SYMBOL(ieee80211_getmgtframe);
/* /*
* Register a vlan group. * Register a vlan group.
*/ */
static void void
ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp) ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp)
{ {
struct ieee80211vap *vap = netdev_priv(dev); struct ieee80211vap *vap = netdev_priv(dev);
@ -189,7 +189,7 @@ ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp)
/* /*
* Add an rx vlan identifier * Add an rx vlan identifier
*/ */
static void void
ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid) ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid)
{ {
struct ieee80211vap *vap = netdev_priv(dev); struct ieee80211vap *vap = netdev_priv(dev);
@ -201,7 +201,7 @@ ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid)
/* /*
* Kill (i.e. delete) a vlan identifier. * Kill (i.e. delete) a vlan identifier.
*/ */
static void void
ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid) ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid)
{ {
struct ieee80211vap *vap = netdev_priv(dev); struct ieee80211vap *vap = netdev_priv(dev);
@ -219,9 +219,6 @@ ieee80211_vlan_vattach(struct ieee80211vap *vap)
dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX | dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
NETIF_F_HW_VLAN_FILTER; NETIF_F_HW_VLAN_FILTER;
dev->vlan_rx_register = ieee80211_vlan_register;
dev->vlan_rx_add_vid = ieee80211_vlan_add_vid;
dev->vlan_rx_kill_vid = ieee80211_vlan_kill_vid;
#endif /* IEEE80211_VLAN_TAG_USED */ #endif /* IEEE80211_VLAN_TAG_USED */
} }

4
net80211/ieee80211_linux.h
View File

@ -636,4 +636,8 @@ int ieee80211_ioctl_create_vap(struct ieee80211com *, struct ifreq *,
struct net_device *); struct net_device *);
struct ieee80211vap *ieee80211_create_vap(struct ieee80211com *, char *, struct ieee80211vap *ieee80211_create_vap(struct ieee80211com *, char *,
struct net_device *, int, int); struct net_device *, int, int);
void ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp);
void ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid);
void ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid);
#endif /* _NET80211_IEEE80211_LINUX_H_ */ #endif /* _NET80211_IEEE80211_LINUX_H_ */