diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-rx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index faad4d3f56e1..38b2946b1d81 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c | |||
@@ -1026,10 +1026,10 @@ static int iwl_is_network_packet(struct iwl_priv *priv, | |||
1026 | /* Filter incoming packets to determine if they are targeted toward | 1026 | /* Filter incoming packets to determine if they are targeted toward |
1027 | * this network, discarding packets coming from ourselves */ | 1027 | * this network, discarding packets coming from ourselves */ |
1028 | switch (priv->iw_mode) { | 1028 | switch (priv->iw_mode) { |
1029 | case IEEE80211_IF_TYPE_IBSS: /* Header: Dest. | Source | BSSID */ | 1029 | case NL80211_IFTYPE_ADHOC: /* Header: Dest. | Source | BSSID */ |
1030 | /* packets to our IBSS update information */ | 1030 | /* packets to our IBSS update information */ |
1031 | return !compare_ether_addr(header->addr3, priv->bssid); | 1031 | return !compare_ether_addr(header->addr3, priv->bssid); |
1032 | case IEEE80211_IF_TYPE_STA: /* Header: Dest. | AP{BSSID} | Source */ | 1032 | case NL80211_IFTYPE_STATION: /* Header: Dest. | AP{BSSID} | Source */ |
1033 | /* packets to our IBSS update information */ | 1033 | /* packets to our IBSS update information */ |
1034 | return !compare_ether_addr(header->addr2, priv->bssid); | 1034 | return !compare_ether_addr(header->addr2, priv->bssid); |
1035 | default: | 1035 | default: |
@@ -1169,7 +1169,7 @@ void iwl_rx_reply_rx(struct iwl_priv *priv, | |||
1169 | rx_status.flag |= RX_FLAG_SHORTPRE; | 1169 | rx_status.flag |= RX_FLAG_SHORTPRE; |
1170 | 1170 | ||
1171 | /* Take shortcut when only in monitor mode */ | 1171 | /* Take shortcut when only in monitor mode */ |
1172 | if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) { | 1172 | if (priv->iw_mode == NL80211_IFTYPE_MONITOR) { |
1173 | iwl_pass_packet_to_mac80211(priv, include_phy, | 1173 | iwl_pass_packet_to_mac80211(priv, include_phy, |
1174 | rxb, &rx_status); | 1174 | rxb, &rx_status); |
1175 | return; | 1175 | return; |
@@ -1186,7 +1186,7 @@ void iwl_rx_reply_rx(struct iwl_priv *priv, | |||
1186 | switch (fc & IEEE80211_FCTL_FTYPE) { | 1186 | switch (fc & IEEE80211_FCTL_FTYPE) { |
1187 | case IEEE80211_FTYPE_MGMT: | 1187 | case IEEE80211_FTYPE_MGMT: |
1188 | case IEEE80211_FTYPE_DATA: | 1188 | case IEEE80211_FTYPE_DATA: |
1189 | if (priv->iw_mode == IEEE80211_IF_TYPE_AP) | 1189 | if (priv->iw_mode == NL80211_IFTYPE_AP) |
1190 | iwl_update_ps_mode(priv, fc & IEEE80211_FCTL_PM, | 1190 | iwl_update_ps_mode(priv, fc & IEEE80211_FCTL_PM, |
1191 | header->addr2); | 1191 | header->addr2); |
1192 | /* fall through */ | 1192 | /* fall through */ |