From a2b205af0934291b66f4435261a9a1175504034b Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Fri, 18 Nov 2011 10:05:26 +0530 Subject: [PATCH] --- yaml --- r: 279231 b: refs/heads/master c: 774439ad88ecec928ab4a438946ee4985116c481 h: refs/heads/master i: 279229: d747018ef80cfb40d9f681fa89841782e36aad09 279227: 518de08556881573d29c437351ec0078d79b2b3f 279223: e698ff6f8a7e67a07970c1dc9c948163f6a3fd5f 279215: 99fe1448520dce3af39c49c450a9ecb1c67235f0 279199: f0d7f7fb37a848aeb075d6121ffd502d2b597cf8 279167: c0b1871e1c5a252701dd2573cc2916408ca0d629 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index cefbc2ecab09..78a5a0e4fa13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb94333a62b7b11041dfb6daad94353ec5fbb7fd +refs/heads/master: 774439ad88ecec928ab4a438946ee4985116c481 diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c index b71d7a4a919a..e37d78bd26f1 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -21,10 +21,8 @@ #include "testmode.h" static unsigned int ath6kl_p2p; -static unsigned int multi_norm_if_support; module_param(ath6kl_p2p, uint, 0644); -module_param(multi_norm_if_support, uint, 0644); #define RATETAB_ENT(_rate, _rateid, _flags) { \ .bitrate = (_rate), \ @@ -2452,14 +2450,13 @@ struct ath6kl *ath6kl_core_alloc(struct device *dev) } ar = wiphy_priv(wiphy); - if (!multi_norm_if_support) - ar->p2p = !!ath6kl_p2p; + ar->p2p = !!ath6kl_p2p; ar->wiphy = wiphy; ar->dev = dev; ar->vif_max = 1; - if (multi_norm_if_support) + if (!ar->p2p) ar->max_norm_iface = 2; else ar->max_norm_iface = 1;