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/torvalds/linux-2.6

Browse Source 
Conflicts:

	net/mac80211/mlme.c
This commit is contained in:
David S. Miller
2008-09-08 16:59:05 -07:00
parent 712d6954e3 82a28c794f
commit 17dce5dfe3
1036 changed files with 34407 additions and 11129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/ieee80211_i.h
View File

@@ -498,8 +498,10 @@ struct ieee80211_sub_if_data {
struct {
struct dentry *mode;
} monitor;
struct dentry *default_key;
} debugfs;
struct {
struct dentry *default_key;
} common_debugfs;
#ifdef CONFIG_MAC80211_MESH
struct dentry *mesh_stats_dir;