]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
iwlwifi: rename iwl4965_rx_mpdu_res_start
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Mon, 7 Jun 2010 20:21:47 +0000 (13:21 -0700)
committerReinette Chatre <reinette.chatre@intel.com>
Mon, 14 Jun 2010 18:00:25 +0000 (11:00 -0700)
iwl4965_rx_mpdu_res_start is not 4695 specific, so rename it to more
general name iwl_rx_mpdu_res_start.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
drivers/net/wireless/iwlwifi/iwl-commands.h

index 90bd98c1ce8058ff87dfd14f3b9181fb3b854ebf..0e7b0661d61d4a1ecd7c8d54c10c42327b06b266 100644 (file)
@@ -904,7 +904,7 @@ void iwlagn_rx_reply_rx(struct iwl_priv *priv,
        struct iwl_rx_packet *pkt = rxb_addr(rxb);
        struct iwl_rx_phy_res *phy_res;
        __le32 rx_pkt_status;
-       struct iwl4965_rx_mpdu_res_start *amsdu;
+       struct iwl_rx_mpdu_res_start *amsdu;
        u32 len;
        u32 ampdu_status;
        u32 rate_n_flags;
@@ -933,7 +933,7 @@ void iwlagn_rx_reply_rx(struct iwl_priv *priv,
                        return;
                }
                phy_res = &priv->_agn.last_phy_res;
-               amsdu = (struct iwl4965_rx_mpdu_res_start *)pkt->u.raw;
+               amsdu = (struct iwl_rx_mpdu_res_start *)pkt->u.raw;
                header = (struct ieee80211_hdr *)(pkt->u.raw + sizeof(*amsdu));
                len = le16_to_cpu(amsdu->byte_count);
                rx_pkt_status = *(__le32 *)(pkt->u.raw + sizeof(*amsdu) + len);
index d5938e43c5dca6df84e729c3d69b5d41d4813fc2..498492565912d592304370cee770e7a1d5dd7729 100644 (file)
@@ -1366,7 +1366,7 @@ struct iwl_rx_phy_res {
        __le16 reserved3;
 } __attribute__ ((packed));
 
-struct iwl4965_rx_mpdu_res_start {
+struct iwl_rx_mpdu_res_start {
        __le16 byte_count;
        __le16 reserved;
 } __attribute__ ((packed));