diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-26 08:26:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-26 08:26:10 +0200 |
| commit | 43154d08d6bb5c69aa0d0e3448fb348b4cd84e91 (patch) | |
| tree | 176edb26aad2d33e8be36530b66b19d0603c4b1d /net/mac80211/wext.c | |
| parent | tipc: Fix initialization sequence problems when entering network mode (diff) | |
| parent | vlan: Use bitmask of feature flags instead of seperate feature bits (diff) | |
| download | linux-43154d08d6bb5c69aa0d0e3448fb348b4cd84e91.tar.xz linux-43154d08d6bb5c69aa0d0e3448fb348b4cd84e91.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/cpmac.c
net/mac80211/mlme.c
Diffstat (limited to 'net/mac80211/wext.c')
| -rw-r--r-- | net/mac80211/wext.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index 6a342a9a40cd..c2e2378af082 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c @@ -221,7 +221,6 @@ static int ieee80211_ioctl_giwrange(struct net_device *dev, range->num_frequency = c; IW_EVENT_CAPA_SET_KERNEL(range->event_capa); - IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWTHRSPY); IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWAP); IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWSCAN); |