aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2009-07-16 08:15:44 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-20 11:38:05 -0400
commit240e86efd60e6bc232a072273a7f7794bcb035e0 (patch)
tree01beb81eaf7f3efb751edc63563a3c46454ef3ec
parente81cd2d664fe5b75a0db9bb24b43c0dfbde32319 (diff)
mwl8k: ->add_interface() is not called for monitor interfaces
There is no need to check for NL80211_IFTYPE_MONITOR in ->add_interface(), as this function is never called for monitor interfaces. Also, there is no need to advertise this bit in our wiphy's ->interface_modes. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/mwl8k.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index a961b698c691..301d2a20d42b 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -2883,8 +2883,7 @@ static int mwl8k_add_interface(struct ieee80211_hw *hw,
2883 /* 2883 /*
2884 * We only support managed interfaces for now. 2884 * We only support managed interfaces for now.
2885 */ 2885 */
2886 if (conf->type != NL80211_IFTYPE_STATION && 2886 if (conf->type != NL80211_IFTYPE_STATION)
2887 conf->type != NL80211_IFTYPE_MONITOR)
2888 return -EINVAL; 2887 return -EINVAL;
2889 2888
2890 /* Clean out driver private area */ 2889 /* Clean out driver private area */
@@ -3440,8 +3439,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
3440 3439
3441 hw->queues = MWL8K_TX_QUEUES; 3440 hw->queues = MWL8K_TX_QUEUES;
3442 3441
3443 hw->wiphy->interface_modes = 3442 hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
3444 BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_MONITOR);
3445 3443
3446 /* Set rssi and noise values to dBm */ 3444 /* Set rssi and noise values to dBm */
3447 hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_NOISE_DBM; 3445 hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_NOISE_DBM;