git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
include
/
net
/
ieee80211softmac_wx.h
diff --git
a/include/net/ieee80211softmac_wx.h
b/include/net/ieee80211softmac_wx.h
index
3e0be45
..
4ee3ad5
100644
(file)
--- a/
include/net/ieee80211softmac_wx.h
+++ b/
include/net/ieee80211softmac_wx.h
@@
-91,4
+91,9
@@
ieee80211softmac_wx_get_genie(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu,
char *extra);
+extern int
+ieee80211softmac_wx_set_mlme(struct net_device *dev,
+ struct iw_request_info *info,
+ union iwreq_data *wrqu,
+ char *extra);
#endif /* _IEEE80211SOFTMAC_WX */