projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'wireless-drivers-next-for-davem-2015-04-01' of git://git.kernel.org/pub...
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
mwifiex
/
main.h
diff --git
a/drivers/net/wireless/mwifiex/main.h
b/drivers/net/wireless/mwifiex/main.h
index
b97b85b
..
fe12560
100644
(file)
--- a/
drivers/net/wireless/mwifiex/main.h
+++ b/
drivers/net/wireless/mwifiex/main.h
@@
-1335,6
+1335,7
@@
u8 mwifiex_chan_type_to_sec_chan_offset(enum nl80211_channel_type chan_type);
struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
const char *name,
+ unsigned char name_assign_type,
enum nl80211_iftype type,
u32 *flags,
struct vif_params *params);