diff options
author | David S. Miller <davem@davemloft.net> | 2010-12-22 20:34:40 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-22 20:34:40 -0500 |
commit | b7e03ec9a6b9d0c0cb1e435026d46dfcd78e48ac (patch) | |
tree | eb00fdc7f8ea3132e0eee3eb1a5925df73f5d859 /drivers/net/wireless/hostap/hostap_main.c | |
parent | 762e30239cce9ff0d82227ade663feed2f6283d8 (diff) | |
parent | b51aff057c9d0ef6c529dc25fd9f775faf7b6c63 (diff) |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_main.c')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c index 25a2722c8a98..1d9aed645723 100644 --- a/drivers/net/wireless/hostap/hostap_main.c +++ b/drivers/net/wireless/hostap/hostap_main.c | |||
@@ -891,7 +891,6 @@ void hostap_setup_dev(struct net_device *dev, local_info_t *local, | |||
891 | 891 | ||
892 | SET_ETHTOOL_OPS(dev, &prism2_ethtool_ops); | 892 | SET_ETHTOOL_OPS(dev, &prism2_ethtool_ops); |
893 | 893 | ||
894 | netif_stop_queue(dev); | ||
895 | } | 894 | } |
896 | 895 | ||
897 | static int hostap_enable_hostapd(local_info_t *local, int rtnl_locked) | 896 | static int hostap_enable_hostapd(local_info_t *local, int rtnl_locked) |