xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	drivers/net/cpmac.c
	net/mac80211/mlme.c
This commit is contained in:
David S. Miller
2008-05-25 23:26:10 -07:00
parent 03194379a7 289c79a4bd
commit 43154d08d6
93 changed files with 1106 additions and 1071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/mac80211/wext.c
View File

@@ -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);