rt2x00: Use IEEE80211_IF_TYPE_INVALID directly

No need to use a seperate define INVALID_INTERFACE while
we can use IEEE80211_IF_TYPE_INVALID directly.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index ba874cff8648178a1058da05975842eea5655bc9..103a122bc9c3c3741b22cb4f4d5fa3d3b4027564 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -369,10 +369,8 @@ struct interface {
 
        /*
         * Current working type (IEEE80211_IF_TYPE_*).
-        * When set to INVALID_INTERFACE, no interface is configured.
         */
        int type;
-#define INVALID_INTERFACE      IEEE80211_IF_TYPE_INVALID
 
        /*
         * MAC of the device.

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 48e251561f833fff36ef9afbeaee3f5817a0c1eb..bd7b73824d0f2648ce45ab835afadd9b31f98262 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1170,7 +1170,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
        /*
         * Reset current working type.
         */
-       rt2x00dev->interface.type = INVALID_INTERFACE;
+       rt2x00dev->interface.type = IEEE80211_IF_TYPE_INVALID;
 
        /*
         * Allocate ring array.

diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index e216c34a51ae85936931a083e99989b59145a20f..bae444292d63b2f9f4c5f5b306123dba628aa058 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -242,7 +242,7 @@ void rt2x00mac_remove_interface(struct ieee80211_hw *hw,
                return;
 
        intf->id = 0;
-       intf->type = INVALID_INTERFACE;
+       intf->type = IEEE80211_IF_TYPE_INVALID;
        memset(&intf->bssid, 0x00, ETH_ALEN);
        memset(&intf->mac, 0x00, ETH_ALEN);