Changeset 4068 for madwifi/branches/madwifi-hal-testing/net80211/ieee80211.c

Timestamp:

07/04/09 05:10:46 (3 years ago)

Author:

proski

Message:

Merge r4022, r4059 and r4061 from trunk

Files:

• madwifi/branches/madwifi-hal-testing/net80211/ieee80211.c (modified) (2 diffs)

madwifi/branches/madwifi-hal-testing/net80211/ieee80211.c

@@ -410 +410 @@
-        .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
@@ -442 +447 @@
-        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;