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 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux...
[pandora-kernel.git]
/
net
/
mac80211
/
ieee80211_i.h
diff --git
a/net/mac80211/ieee80211_i.h
b/net/mac80211/ieee80211_i.h
index
0a570a1
..
a404017
100644
(file)
--- a/
net/mac80211/ieee80211_i.h
+++ b/
net/mac80211/ieee80211_i.h
@@
-957,6
+957,7
@@
struct ieee80211_local {
unsigned int hw_roc_duration;
u32 hw_roc_cookie;
bool hw_roc_for_tx;
+ unsigned long hw_offchan_tx_cookie;
/* dummy netdev for use w/ NAPI */
struct net_device napi_dev;