diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-20 04:01:29 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-20 04:01:29 -0800 |
| commit | f7f65d1e8bfaa92c1a419c2a52faeca835659295 (patch) | |
| tree | b616a113bddb2728fca89ef3062c16b220cee620 /drivers/net/wireless/iwlwifi/iwl-dev.h | |
| parent | eafdcb433f854c8cb06747a80fa3df7c72147be6 (diff) | |
| parent | 4018517a1a69a85c3d61b20fa02f187b80773137 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index c018121085e..9966d4e384c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -89,7 +89,8 @@ extern struct iwl_cfg iwl5100_abg_cfg; #define DEFAULT_LONG_RETRY_LIMIT 4U struct iwl_rx_mem_buffer { - dma_addr_t dma_addr; + dma_addr_t real_dma_addr; + dma_addr_t aligned_dma_addr; struct sk_buff *skb; struct list_head list; }; |