diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2007-11-27 15:49:50 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:05:09 -0500 |
commit | d28c2561fb09dcc0b47ae0ba12083cf0d988495f (patch) | |
tree | 2226eafcc717af2e21e9f872978938ba64fbc6c6 | |
parent | 4d8dd66c1659ba0d1b110ed0488f4f6ffbc90e71 (diff) |
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>
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index ba874cff8648..103a122bc9c3 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
@@ -369,10 +369,8 @@ struct interface { | |||
369 | 369 | ||
370 | /* | 370 | /* |
371 | * Current working type (IEEE80211_IF_TYPE_*). | 371 | * Current working type (IEEE80211_IF_TYPE_*). |
372 | * When set to INVALID_INTERFACE, no interface is configured. | ||
373 | */ | 372 | */ |
374 | int type; | 373 | int type; |
375 | #define INVALID_INTERFACE IEEE80211_IF_TYPE_INVALID | ||
376 | 374 | ||
377 | /* | 375 | /* |
378 | * MAC of the device. | 376 | * MAC of the device. |
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 48e251561f83..bd7b73824d0f 100644 --- 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) | |||
1170 | /* | 1170 | /* |
1171 | * Reset current working type. | 1171 | * Reset current working type. |
1172 | */ | 1172 | */ |
1173 | rt2x00dev->interface.type = INVALID_INTERFACE; | 1173 | rt2x00dev->interface.type = IEEE80211_IF_TYPE_INVALID; |
1174 | 1174 | ||
1175 | /* | 1175 | /* |
1176 | * Allocate ring array. | 1176 | * Allocate ring array. |
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index e216c34a51ae..bae444292d63 100644 --- 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, | |||
242 | return; | 242 | return; |
243 | 243 | ||
244 | intf->id = 0; | 244 | intf->id = 0; |
245 | intf->type = INVALID_INTERFACE; | 245 | intf->type = IEEE80211_IF_TYPE_INVALID; |
246 | memset(&intf->bssid, 0x00, ETH_ALEN); | 246 | memset(&intf->bssid, 0x00, ETH_ALEN); |
247 | memset(&intf->mac, 0x00, ETH_ALEN); | 247 | memset(&intf->mac, 0x00, ETH_ALEN); |
248 | 248 | ||