summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/3945.c
diff options
context:
space:
mode:
authorStanislaw Gruszka2011-08-31 13:23:20 +0200
committerStanislaw Gruszka2011-11-15 14:20:09 +0100
commite94a4099adb2ec148776975bcd953a01c6bec992 (patch)
tree45264af5a425af0d113c764512fc4da2e01d1906 /drivers/net/wireless/iwlegacy/3945.c
parentiwlegacy: rename iwl-core.h to common.h (diff)
downloadkernel-qcow2-linux-e94a4099adb2ec148776975bcd953a01c6bec992.tar.gz
kernel-qcow2-linux-e94a4099adb2ec148776975bcd953a01c6bec992.tar.xz
kernel-qcow2-linux-e94a4099adb2ec148776975bcd953a01c6bec992.zip
iwlegacy: merge common header files
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/3945.c')
-rw-r--r--drivers/net/wireless/iwlegacy/3945.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
index 795d206f10e8..02ae32cc90de 100644
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -39,11 +39,9 @@
#include <asm/unaligned.h>
#include <net/mac80211.h>
+#include "common.h"
#include "commands.h"
-#include "iwl-sta.h"
#include "iwl-eeprom.h"
-#include "common.h"
-#include "iwl-helpers.h"
#include "iwl-led.h"
#include "3945.h"
@@ -417,7 +415,7 @@ void il3945_hdl_stats(struct il_priv *il,
D_RX("Statistics notification received (%d vs %d).\n",
(int)sizeof(struct il3945_notif_stats),
- le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK);
+ le32_to_cpu(pkt->len_n_flags) & IL_RX_FRAME_SIZE_MSK);
#ifdef CONFIG_IWLEGACY_DEBUGFS
il3945_accumulative_stats(il, (__le32 *)&pkt->u.raw);
#endif