diff options
author | Martin Decky <martin@decky.cz> | 2009-09-09 21:44:47 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-09-14 14:36:03 -0400 |
commit | e484c16f6212f7f06407382efa4d3ad214b6c589 (patch) | |
tree | 71daa641bd545bdff1198336f2fae6985dbe081a /drivers/net/wireless/hostap | |
parent | 13af7a6ea502fcdd4c0e3d7de6e332b102309491 (diff) |
hostap: Revert a toxic part of the conversion to net_device_ops
As the hostap driver was converted to use net_device_ops, a mistake was
made in hostap_main.c (commit 5ae4efbcd2611562a8b93596be034e63495706a5).
Originally, the tx_queue_len was set to 0 for every other interface than
HOSTAP_INTERFACE_MASTER, but the new fragment of code sets tx_queue_len to
0 only for HOSTAP_INTERFACE_MASTER. The opposite of the previous
behavior makes the driver to drop all packets in AP mode.
Change the way 0 is assigned to tx_queue_len according to the original
logic.
Signed-off-by: Martin Decky <martin@decky.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/hostap')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c index 6fe122f18c0d..eb57d1ea361f 100644 --- a/drivers/net/wireless/hostap/hostap_main.c +++ b/drivers/net/wireless/hostap/hostap_main.c | |||
@@ -875,15 +875,16 @@ void hostap_setup_dev(struct net_device *dev, local_info_t *local, | |||
875 | 875 | ||
876 | switch(type) { | 876 | switch(type) { |
877 | case HOSTAP_INTERFACE_AP: | 877 | case HOSTAP_INTERFACE_AP: |
878 | dev->tx_queue_len = 0; /* use main radio device queue */ | ||
878 | dev->netdev_ops = &hostap_mgmt_netdev_ops; | 879 | dev->netdev_ops = &hostap_mgmt_netdev_ops; |
879 | dev->type = ARPHRD_IEEE80211; | 880 | dev->type = ARPHRD_IEEE80211; |
880 | dev->header_ops = &hostap_80211_ops; | 881 | dev->header_ops = &hostap_80211_ops; |
881 | break; | 882 | break; |
882 | case HOSTAP_INTERFACE_MASTER: | 883 | case HOSTAP_INTERFACE_MASTER: |
883 | dev->tx_queue_len = 0; /* use main radio device queue */ | ||
884 | dev->netdev_ops = &hostap_master_ops; | 884 | dev->netdev_ops = &hostap_master_ops; |
885 | break; | 885 | break; |
886 | default: | 886 | default: |
887 | dev->tx_queue_len = 0; /* use main radio device queue */ | ||
887 | dev->netdev_ops = &hostap_netdev_ops; | 888 | dev->netdev_ops = &hostap_netdev_ops; |
888 | } | 889 | } |
889 | 890 | ||