diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-commands.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index 90bd98c1ce80..0e7b0661d61d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |||
@@ -904,7 +904,7 @@ void iwlagn_rx_reply_rx(struct iwl_priv *priv, | |||
904 | struct iwl_rx_packet *pkt = rxb_addr(rxb); | 904 | struct iwl_rx_packet *pkt = rxb_addr(rxb); |
905 | struct iwl_rx_phy_res *phy_res; | 905 | struct iwl_rx_phy_res *phy_res; |
906 | __le32 rx_pkt_status; | 906 | __le32 rx_pkt_status; |
907 | struct iwl4965_rx_mpdu_res_start *amsdu; | 907 | struct iwl_rx_mpdu_res_start *amsdu; |
908 | u32 len; | 908 | u32 len; |
909 | u32 ampdu_status; | 909 | u32 ampdu_status; |
910 | u32 rate_n_flags; | 910 | u32 rate_n_flags; |
@@ -933,7 +933,7 @@ void iwlagn_rx_reply_rx(struct iwl_priv *priv, | |||
933 | return; | 933 | return; |
934 | } | 934 | } |
935 | phy_res = &priv->_agn.last_phy_res; | 935 | phy_res = &priv->_agn.last_phy_res; |
936 | amsdu = (struct iwl4965_rx_mpdu_res_start *)pkt->u.raw; | 936 | amsdu = (struct iwl_rx_mpdu_res_start *)pkt->u.raw; |
937 | header = (struct ieee80211_hdr *)(pkt->u.raw + sizeof(*amsdu)); | 937 | header = (struct ieee80211_hdr *)(pkt->u.raw + sizeof(*amsdu)); |
938 | len = le16_to_cpu(amsdu->byte_count); | 938 | len = le16_to_cpu(amsdu->byte_count); |
939 | rx_pkt_status = *(__le32 *)(pkt->u.raw + sizeof(*amsdu) + len); | 939 | rx_pkt_status = *(__le32 *)(pkt->u.raw + sizeof(*amsdu) + len); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h index d5938e43c5dc..498492565912 100644 --- a/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-commands.h | |||
@@ -1366,7 +1366,7 @@ struct iwl_rx_phy_res { | |||
1366 | __le16 reserved3; | 1366 | __le16 reserved3; |
1367 | } __attribute__ ((packed)); | 1367 | } __attribute__ ((packed)); |
1368 | 1368 | ||
1369 | struct iwl4965_rx_mpdu_res_start { | 1369 | struct iwl_rx_mpdu_res_start { |
1370 | __le16 byte_count; | 1370 | __le16 byte_count; |
1371 | __le16 reserved; | 1371 | __le16 reserved; |
1372 | } __attribute__ ((packed)); | 1372 | } __attribute__ ((packed)); |