1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-21 18:44:44 +02:00

madwifi: fix another unconverted netdev_ops issue

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17431 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2009-08-28 12:50:56 +00:00
parent 85545a1d5a
commit dc9b2994c5

View File

@ -88,7 +88,7 @@ http://madwifi-project.org/changeset/4005
int int
ieee80211_vap_setup(struct ieee80211com *ic, struct net_device *dev, ieee80211_vap_setup(struct ieee80211com *ic, struct net_device *dev,
const char *name, int opmode, int flags, struct ieee80211vap *master) const char *name, int opmode, int flags, struct ieee80211vap *master)
@@ -470,12 +482,17 @@ ieee80211_vap_setup(struct ieee80211com @@ -470,16 +482,21 @@ ieee80211_vap_setup(struct ieee80211com
} else } else
strncpy(dev->name, name, sizeof(dev->name)); strncpy(dev->name, name, sizeof(dev->name));
} }
@ -100,12 +100,16 @@ http://madwifi-project.org/changeset/4005
dev->hard_start_xmit = ieee80211_hardstart; dev->hard_start_xmit = ieee80211_hardstart;
dev->set_multicast_list = ieee80211_set_multicast_list; dev->set_multicast_list = ieee80211_set_multicast_list;
+ dev->do_ioctl = ieee80211_ioctl; + dev->do_ioctl = ieee80211_ioctl;
+#else
+ dev->netdev_ops = &ieee80211_netdev_ops;
+#endif
#if 0 #if 0
dev->set_mac_address = ieee80211_set_mac_address; dev->set_mac_address = ieee80211_set_mac_address;
#endif #endif
dev->change_mtu = ieee80211_change_mtu;
+#else
+ dev->netdev_ops = &ieee80211_netdev_ops;
+#endif
dev->tx_queue_len = 0; /* NB: bypass queuing */
dev->hard_header_len = parent->hard_header_len;
/*
@@ -1823,7 +1840,11 @@ ieee80211_set_multicast_list(struct net_ @@ -1823,7 +1840,11 @@ ieee80211_set_multicast_list(struct net_
IEEE80211_UNLOCK_IRQ(ic); IEEE80211_UNLOCK_IRQ(ic);