diff options
| author | Stanislaw Gruszka | 2011-08-31 13:23:20 +0200 |
|---|---|---|
| committer | Stanislaw Gruszka | 2011-11-15 14:20:09 +0100 |
| commit | e94a4099adb2ec148776975bcd953a01c6bec992 (patch) | |
| tree | 45264af5a425af0d113c764512fc4da2e01d1906 /drivers/net/wireless/iwlegacy/4965-mac.c | |
| parent | iwlegacy: rename iwl-core.h to common.h (diff) | |
| download | kernel-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/4965-mac.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 2f747e4bd2fc..6848b9182a71 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c @@ -51,11 +51,7 @@ #define DRV_NAME "iwl4965" #include "iwl-eeprom.h" -#include "iwl-dev.h" #include "common.h" -#include "iwl-io.h" -#include "iwl-helpers.h" -#include "iwl-sta.h" #include "4965.h" @@ -1362,7 +1358,7 @@ void il4965_hdl_stats(struct il_priv *il, "Statistics notification received (%d vs %d).\n", (int)sizeof(struct il_notif_stats), le32_to_cpu(pkt->len_n_flags) & - FH_RSCSR_FRAME_SIZE_MSK); + IL_RX_FRAME_SIZE_MSK); change = ((il->_4965.stats.general.common.temperature != pkt->u.stats.general.common.temperature) || @@ -4009,7 +4005,7 @@ void il4965_rx_handle(struct il_priv *il) PCI_DMA_FROMDEVICE); pkt = rxb_addr(rxb); - len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK; + len = le32_to_cpu(pkt->len_n_flags) & IL_RX_FRAME_SIZE_MSK; len += sizeof(u32); /* account for status word */ /* Reclaim a command buffer only if this packet is a response |