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

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

Browse Source 
Conflicts:
	net/mac80211/mlme.c
This commit is contained in:
John W. Linville
2010-06-17 16:21:14 -04:00
parent 6a0076e02a 021570e55b
commit abf52f86aa
13 changed files with 96 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/mac80211/work.c
View File

@@ -715,7 +715,7 @@ static void ieee80211_work_rx_queued_mgmt(struct ieee80211_local *local,
struct ieee80211_rx_status *rx_status;
struct ieee80211_mgmt *mgmt;
struct ieee80211_work *wk;
enum work_action rma;
enum work_action rma = WORK_ACT_NONE;
u16 fc;
rx_status = (struct ieee80211_rx_status *) skb->cb;