diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-rx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rx.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index 9d010a0d83a..cc980d5d57c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c | |||
@@ -1028,7 +1028,6 @@ void iwl_rx_reply_rx(struct iwl_priv *priv, | |||
1028 | struct iwl4965_rx_mpdu_res_start *amsdu; | 1028 | struct iwl4965_rx_mpdu_res_start *amsdu; |
1029 | u32 len; | 1029 | u32 len; |
1030 | u32 ampdu_status; | 1030 | u32 ampdu_status; |
1031 | u16 fc; | ||
1032 | u32 rate_n_flags; | 1031 | u32 rate_n_flags; |
1033 | 1032 | ||
1034 | /** | 1033 | /** |
@@ -1161,20 +1160,8 @@ void iwl_rx_reply_rx(struct iwl_priv *priv, | |||
1161 | priv->last_tsf = le64_to_cpu(phy_res->timestamp); | 1160 | priv->last_tsf = le64_to_cpu(phy_res->timestamp); |
1162 | } | 1161 | } |
1163 | 1162 | ||
1164 | fc = le16_to_cpu(header->frame_control); | 1163 | iwl_pass_packet_to_mac80211(priv, header, len, ampdu_status, |
1165 | switch (fc & IEEE80211_FCTL_FTYPE) { | 1164 | rxb, &rx_status); |
1166 | case IEEE80211_FTYPE_MGMT: | ||
1167 | case IEEE80211_FTYPE_DATA: | ||
1168 | if (priv->iw_mode == NL80211_IFTYPE_AP) | ||
1169 | iwl_update_ps_mode(priv, fc & IEEE80211_FCTL_PM, | ||
1170 | header->addr2); | ||
1171 | /* fall through */ | ||
1172 | default: | ||
1173 | iwl_pass_packet_to_mac80211(priv, header, len, ampdu_status, | ||
1174 | rxb, &rx_status); | ||
1175 | break; | ||
1176 | |||
1177 | } | ||
1178 | } | 1165 | } |
1179 | EXPORT_SYMBOL(iwl_rx_reply_rx); | 1166 | EXPORT_SYMBOL(iwl_rx_reply_rx); |
1180 | 1167 | ||