Skip to content

L
linux-davinci-2.6.23
Commit 1b5cca3a authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

ieee80211: remove last uses of compat define WLAN_CAPABILITY_BSS

parent 2474385e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
include/net/ieee80211.h
View file @ 1b5cca3a
...@@ -265,7 +265,6 @@ struct ieee80211_snap_hdr { ...@@ -265,7 +265,6 @@ struct ieee80211_snap_hdr {
#define WLAN_AUTH_CHALLENGE_LEN 128 #define WLAN_AUTH_CHALLENGE_LEN 128
#define WLAN_CAPABILITY_ESS (1<<0) #define WLAN_CAPABILITY_ESS (1<<0)
#define WLAN_CAPABILITY_BSS WLAN_CAPABILITY_ESS
#define WLAN_CAPABILITY_IBSS (1<<1) #define WLAN_CAPABILITY_IBSS (1<<1)
#define WLAN_CAPABILITY_CF_POLLABLE (1<<2) #define WLAN_CAPABILITY_CF_POLLABLE (1<<2)
#define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3) #define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3)
......
net/ieee80211/ieee80211_wx.c
View file @ 1b5cca3a
...@@ -77,8 +77,8 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee, ...@@ -77,8 +77,8 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
/* Add mode */ /* Add mode */
iwe.cmd = SIOCGIWMODE; iwe.cmd = SIOCGIWMODE;
if (network->capability & if (network->capability &
(WLAN_CAPABILITY_BSS | WLAN_CAPABILITY_IBSS)) { (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)) {
if (network->capability & WLAN_CAPABILITY_BSS) if (network->capability & WLAN_CAPABILITY_ESS)
iwe.u.mode = IW_MODE_MASTER; iwe.u.mode = IW_MODE_MASTER;
else else
iwe.u.mode = IW_MODE_ADHOC; iwe.u.mode = IW_MODE_ADHOC;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment