Compile fix with VLAN support on recent kernels

[madwifi/.git] / net80211 / ieee80211.c

diff --git a/net80211/ieee80211.c b/net80211/ieee80211.c
index 9b5d3e00c9a24b27be33fd99c490484333ad2e20..ea21c5f2af8f53724e9d9586a9442b6d5ac9c29d 100644 (file)
--- a/net80211/ieee80211.c
+++ b/net80211/ieee80211.c
@@ -409,6 +409,11 @@ static const struct net_device_ops ieee80211_netdev_ops = {
        .ndo_set_multicast_list = ieee80211_set_multicast_list,
        .ndo_change_mtu         = ieee80211_change_mtu,
        .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
 
@@ -441,6 +446,11 @@ ieee80211_vap_setup(struct ieee80211com *ic, struct net_device *dev,
        dev->set_multicast_list = ieee80211_set_multicast_list;
        dev->change_mtu = ieee80211_change_mtu;
        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
        dev->netdev_ops = &ieee80211_netdev_ops;
 #endif
@@ -706,7 +716,7 @@ ieee80211_find_channel(struct ieee80211com *ic, int freq, int flags)
                c = &ic->ic_channels[i];
                if (c->ic_freq == freq &&
                    (flags == 0 || 
-                    (c->ic_flags & IEEE80211_CHAN_ALLTURBO) == 
+                    (c->ic_flags & IEEE80211_CHAN_ALLTURBO) ==
                     (flags & IEEE80211_CHAN_ALLTURBO)))
                        return c;
        }