summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/4965-mac.c
diff options
context:
space:
mode:
authorStanislaw Gruszka2011-08-30 13:58:27 +0200
committerStanislaw Gruszka2011-11-15 12:59:02 +0100
commitaf038f404ffb851dcefa0c56c5c81cacd06f0903 (patch)
tree5384b91ec6a3298ac90ff9943d029b4af400f639 /drivers/net/wireless/iwlegacy/4965-mac.c
parentiwlegacy: add accidentally removed comments (diff)
downloadkernel-qcow2-linux-af038f404ffb851dcefa0c56c5c81cacd06f0903.tar.gz
kernel-qcow2-linux-af038f404ffb851dcefa0c56c5c81cacd06f0903.tar.xz
kernel-qcow2-linux-af038f404ffb851dcefa0c56c5c81cacd06f0903.zip
iwlegacy: move iwl-4965-{,hw,debugfs,calib}.h to 4965.h
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/4965-mac.c')
-rw-r--r--drivers/net/wireless/iwlegacy/4965-mac.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index a8a6461d103f..ee084a885adc 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -56,8 +56,7 @@
#include "iwl-io.h"
#include "iwl-helpers.h"
#include "iwl-sta.h"
-#include "iwl-4965-calib.h"
-#include "iwl-4965.h"
+#include "4965.h"
/******************************************************************************
@@ -820,6 +819,11 @@ static int il4965_get_channels_for_scan(struct il_priv *il,
return added;
}
+static inline u32 il4965_ant_idx_to_flags(u8 ant_idx)
+{
+ return BIT(ant_idx) << RATE_MCS_ANT_POS;
+}
+
int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif)
{
struct il_host_cmd cmd = {
@@ -1434,7 +1438,7 @@ void il4965_reply_stats(struct il_priv *il,
* mapping. This is implemented here.
*
* Due to the way hw queues are set up (by the hw specific modules like
- * iwl-4965.c), the AC->hw queue mapping is the identity
+ * 4965.c), the AC->hw queue mapping is the identity
* mapping.
*/