summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2013-04-27 08:15:24 -0400
committerSolomon Peachy <pizza@shaftnet.org>2013-04-27 08:15:24 -0400
commit4c4c8091282650c28b2d7875513ccdffd2f667c8 (patch)
tree5803d06263912ac621abfd6e2ed290d78c46034d
parent13deb99877d3308cefa90bd10890a424b058fd8b (diff)
downloadcompat-wireless-cw1200-4c4c8091282650c28b2d7875513ccdffd2f667c8.tar.gz
compat-wireless-cw1200-4c4c8091282650c28b2d7875513ccdffd2f667c8.tar.bz2
compat-wireless-cw1200-4c4c8091282650c28b2d7875513ccdffd2f667c8.zip
[cw1200] A few more checkpatch warnings resolved.
-rw-r--r--drivers/net/wireless/cw1200/main.c3
-rw-r--r--drivers/net/wireless/cw1200/sta.c10
-rw-r--r--drivers/net/wireless/cw1200/sta.h6
3 files changed, 6 insertions, 13 deletions
diff --git a/drivers/net/wireless/cw1200/main.c b/drivers/net/wireless/cw1200/main.c
index a719581..2bd1568 100644
--- a/drivers/net/wireless/cw1200/main.c
+++ b/drivers/net/wireless/cw1200/main.c
@@ -512,7 +512,8 @@ u32 cw1200_dpll_from_clk(u16 clk_khz)
case 0xCB20: /* 52000 KHz */
return 0x07627091;
default:
- pr_err("Unknown Refclk freq (0x%04x), using 2600KHz\n", clk_khz);
+ pr_err("Unknown Refclk freq (0x%04x), using 2600KHz\n",
+ clk_khz);
return 0x0EC4F121;
}
}
diff --git a/drivers/net/wireless/cw1200/sta.c b/drivers/net/wireless/cw1200/sta.c
index f19ee7c..91ce91d 100644
--- a/drivers/net/wireless/cw1200/sta.c
+++ b/drivers/net/wireless/cw1200/sta.c
@@ -1927,16 +1927,6 @@ void cw1200_bss_info_changed(struct ieee80211_hw *dev,
}
rcu_read_unlock();
-#if 0
- /* FIXME: Temporarily disable GF support due to buggy
- * APs advertising support but not handling it
- * properly. Is there a better way to handle this?
- */
- pr_debug("[STA] HT_GF was %d (forcing off)\n",
- cw1200_ht_greenfield(&priv->ht_info));
- priv->ht_info.operation_mode |= IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT;
-#endif
-
/* Non Greenfield stations present */
if (priv->ht_info.operation_mode &
IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT)
diff --git a/drivers/net/wireless/cw1200/sta.h b/drivers/net/wireless/cw1200/sta.h
index 26eb436..685eff8 100644
--- a/drivers/net/wireless/cw1200/sta.h
+++ b/drivers/net/wireless/cw1200/sta.h
@@ -67,8 +67,10 @@ void cw1200_bss_params_work(struct work_struct *work);
void cw1200_keep_alive_work(struct work_struct *work);
void cw1200_tx_failure_work(struct work_struct *work);
-void __cw1200_cqm_bssloss_sm(struct cw1200_common *priv, int init, int good, int bad);
-static inline void cw1200_cqm_bssloss_sm(struct cw1200_common *priv, int init, int good, int bad)
+void __cw1200_cqm_bssloss_sm(struct cw1200_common *priv, int init, int good,
+ int bad);
+static inline void cw1200_cqm_bssloss_sm(struct cw1200_common *priv,
+ int init, int good, int bad)
{
spin_lock(&priv->bss_loss_lock);
__cw1200_cqm_bssloss_sm(priv, init, good, bad);