diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-08-31 07:23:20 -0400 |
---|---|---|
committer | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-11-15 08:20:09 -0500 |
commit | e94a4099adb2ec148776975bcd953a01c6bec992 (patch) | |
tree | 45264af5a425af0d113c764512fc4da2e01d1906 /drivers/net/wireless/iwlegacy/3945-mac.c | |
parent | 98613be06e9de8acd20841d2d85b99c39b3b7814 (diff) |
iwlegacy: merge common header files
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/3945-mac.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/3945-mac.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index b650292a7f89..3c8999960011 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c | |||
@@ -52,11 +52,8 @@ | |||
52 | #define DRV_NAME "iwl3945" | 52 | #define DRV_NAME "iwl3945" |
53 | 53 | ||
54 | #include "commands.h" | 54 | #include "commands.h" |
55 | #include "iwl-sta.h" | ||
56 | #include "3945.h" | ||
57 | #include "common.h" | 55 | #include "common.h" |
58 | #include "iwl-helpers.h" | 56 | #include "3945.h" |
59 | #include "iwl-dev.h" | ||
60 | #include "iwl-spectrum.h" | 57 | #include "iwl-spectrum.h" |
61 | 58 | ||
62 | /* | 59 | /* |
@@ -1242,7 +1239,7 @@ static void il3945_rx_handle(struct il_priv *il) | |||
1242 | PCI_DMA_FROMDEVICE); | 1239 | PCI_DMA_FROMDEVICE); |
1243 | pkt = rxb_addr(rxb); | 1240 | pkt = rxb_addr(rxb); |
1244 | 1241 | ||
1245 | len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK; | 1242 | len = le32_to_cpu(pkt->len_n_flags) & IL_RX_FRAME_SIZE_MSK; |
1246 | len += sizeof(u32); /* account for status word */ | 1243 | len += sizeof(u32); /* account for status word */ |
1247 | 1244 | ||
1248 | /* Reclaim a command buffer only if this packet is a response | 1245 | /* Reclaim a command buffer only if this packet is a response |