aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-08-28 12:50:56 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-08-28 12:50:56 +0000
commitdd203b47c60b995b7ca5c8fe0a76eaecb585deee (patch)
tree301125bda7e6473c0a70a4e8930458b4c83bfbd1 /package
parentfdc851f1fa1f05f306c621f0e70acfe023043cc5 (diff)
downloadmaster-187ad058-dd203b47c60b995b7ca5c8fe0a76eaecb585deee.tar.gz
master-187ad058-dd203b47c60b995b7ca5c8fe0a76eaecb585deee.tar.bz2
master-187ad058-dd203b47c60b995b7ca5c8fe0a76eaecb585deee.zip
madwifi: fix another unconverted netdev_ops issue
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17431 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/madwifi/patches/432-netdev_ops.patch12
1 files changed, 8 insertions, 4 deletions
diff --git a/package/madwifi/patches/432-netdev_ops.patch b/package/madwifi/patches/432-netdev_ops.patch
index c3f8ae6846..ac431e4fa2 100644
--- a/package/madwifi/patches/432-netdev_ops.patch
+++ b/package/madwifi/patches/432-netdev_ops.patch
@@ -88,7 +88,7 @@ http://madwifi-project.org/changeset/4005
int
ieee80211_vap_setup(struct ieee80211com *ic, struct net_device *dev,
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
strncpy(dev->name, name, sizeof(dev->name));
}
@@ -100,12 +100,16 @@ http://madwifi-project.org/changeset/4005
dev->hard_start_xmit = ieee80211_hardstart;
dev->set_multicast_list = ieee80211_set_multicast_list;
+ dev->do_ioctl = ieee80211_ioctl;
-+#else
-+ dev->netdev_ops = &ieee80211_netdev_ops;
-+#endif
#if 0
dev->set_mac_address = ieee80211_set_mac_address;
#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_
IEEE80211_UNLOCK_IRQ(ic);