diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index 3d100e898249..7ca5627cc078 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
@@ -520,10 +520,10 @@ static int iwl3945_is_network_packet(struct iwl3945_priv *priv, | |||
520 | /* Filter incoming packets to determine if they are targeted toward | 520 | /* Filter incoming packets to determine if they are targeted toward |
521 | * this network, discarding packets coming from ourselves */ | 521 | * this network, discarding packets coming from ourselves */ |
522 | switch (priv->iw_mode) { | 522 | switch (priv->iw_mode) { |
523 | case IEEE80211_IF_TYPE_IBSS: /* Header: Dest. | Source | BSSID */ | 523 | case NL80211_IFTYPE_ADHOC: /* Header: Dest. | Source | BSSID */ |
524 | /* packets to our IBSS update information */ | 524 | /* packets to our IBSS update information */ |
525 | return !compare_ether_addr(header->addr3, priv->bssid); | 525 | return !compare_ether_addr(header->addr3, priv->bssid); |
526 | case IEEE80211_IF_TYPE_STA: /* Header: Dest. | AP{BSSID} | Source */ | 526 | case NL80211_IFTYPE_STATION: /* Header: Dest. | AP{BSSID} | Source */ |
527 | /* packets to our IBSS update information */ | 527 | /* packets to our IBSS update information */ |
528 | return !compare_ether_addr(header->addr2, priv->bssid); | 528 | return !compare_ether_addr(header->addr2, priv->bssid); |
529 | default: | 529 | default: |
@@ -807,7 +807,7 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl3945_priv *priv, | |||
807 | 807 | ||
808 | priv->stations[sta_id].current_rate.rate_n_flags = rate; | 808 | priv->stations[sta_id].current_rate.rate_n_flags = rate; |
809 | 809 | ||
810 | if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS) && | 810 | if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) && |
811 | (sta_id != priv->hw_setting.bcast_sta_id) && | 811 | (sta_id != priv->hw_setting.bcast_sta_id) && |
812 | (sta_id != IWL_MULTICAST_ID)) | 812 | (sta_id != IWL_MULTICAST_ID)) |
813 | priv->stations[IWL_STA_ID].current_rate.rate_n_flags = rate; | 813 | priv->stations[IWL_STA_ID].current_rate.rate_n_flags = rate; |