diff options
author | Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com> | 2011-11-17 23:35:26 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-11-21 12:47:08 -0500 |
commit | 774439ad88ecec928ab4a438946ee4985116c481 (patch) | |
tree | 8d6433e1577bcff9f17af8b6725a2d143fec1498 /drivers/net | |
parent | fb94333a62b7b11041dfb6daad94353ec5fbb7fd (diff) |
ath6kl: Remove modparam multi_norm_if_support
This modparam was introduced to enable non-p2p mode operation
on two virtual interfaces. It does not seem to be necessary to
have a separate module parameter to do that. Instead, this option
can be enabled when any one of the interfaces is not going to be
used for p2p (ath6kl_p2p).
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index b71d7a4a919a..e37d78bd26f1 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c | |||
@@ -21,10 +21,8 @@ | |||
21 | #include "testmode.h" | 21 | #include "testmode.h" |
22 | 22 | ||
23 | static unsigned int ath6kl_p2p; | 23 | static unsigned int ath6kl_p2p; |
24 | static unsigned int multi_norm_if_support; | ||
25 | 24 | ||
26 | module_param(ath6kl_p2p, uint, 0644); | 25 | module_param(ath6kl_p2p, uint, 0644); |
27 | module_param(multi_norm_if_support, uint, 0644); | ||
28 | 26 | ||
29 | #define RATETAB_ENT(_rate, _rateid, _flags) { \ | 27 | #define RATETAB_ENT(_rate, _rateid, _flags) { \ |
30 | .bitrate = (_rate), \ | 28 | .bitrate = (_rate), \ |
@@ -2452,14 +2450,13 @@ struct ath6kl *ath6kl_core_alloc(struct device *dev) | |||
2452 | } | 2450 | } |
2453 | 2451 | ||
2454 | ar = wiphy_priv(wiphy); | 2452 | ar = wiphy_priv(wiphy); |
2455 | if (!multi_norm_if_support) | 2453 | ar->p2p = !!ath6kl_p2p; |
2456 | ar->p2p = !!ath6kl_p2p; | ||
2457 | ar->wiphy = wiphy; | 2454 | ar->wiphy = wiphy; |
2458 | ar->dev = dev; | 2455 | ar->dev = dev; |
2459 | 2456 | ||
2460 | ar->vif_max = 1; | 2457 | ar->vif_max = 1; |
2461 | 2458 | ||
2462 | if (multi_norm_if_support) | 2459 | if (!ar->p2p) |
2463 | ar->max_norm_iface = 2; | 2460 | ar->max_norm_iface = 2; |
2464 | else | 2461 | else |
2465 | ar->max_norm_iface = 1; | 2462 | ar->max_norm_iface = 1; |