mac80211: use nl80211 interface types

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / iwlwifi / iwl-rx.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
index faad4d3f56e10617d304bfdaef4ead180717d8f2..38b2946b1d81b81aa8b6ddd260d189f0d06c9bde 100644 (file)
--- 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,
        /* Filter incoming packets to determine if they are targeted toward
         * this network, discarding packets coming from ourselves */
        switch (priv->iw_mode) {
-       case IEEE80211_IF_TYPE_IBSS: /* Header: Dest. | Source    | BSSID */
+       case NL80211_IFTYPE_ADHOC: /* Header: Dest. | Source    | BSSID */
                /* packets to our IBSS update information */
                return !compare_ether_addr(header->addr3, priv->bssid);
-       case IEEE80211_IF_TYPE_STA: /* Header: Dest. | AP{BSSID} | Source */
+       case NL80211_IFTYPE_STATION: /* Header: Dest. | AP{BSSID} | Source */
                /* packets to our IBSS update information */
                return !compare_ether_addr(header->addr2, priv->bssid);
        default:
@@ -1169,7 +1169,7 @@ void iwl_rx_reply_rx(struct iwl_priv *priv,
                rx_status.flag |= RX_FLAG_SHORTPRE;
 
        /* Take shortcut when only in monitor mode */
-       if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) {
+       if (priv->iw_mode == NL80211_IFTYPE_MONITOR) {
                iwl_pass_packet_to_mac80211(priv, include_phy,
                                                 rxb, &rx_status);
                return;
@@ -1186,7 +1186,7 @@ void iwl_rx_reply_rx(struct iwl_priv *priv,
        switch (fc & IEEE80211_FCTL_FTYPE) {
        case IEEE80211_FTYPE_MGMT:
        case IEEE80211_FTYPE_DATA:
-               if (priv->iw_mode == IEEE80211_IF_TYPE_AP)
+               if (priv->iw_mode == NL80211_IFTYPE_AP)
                        iwl_update_ps_mode(priv, fc  & IEEE80211_FCTL_PM,
                                                header->addr2);
                /* fall through */