projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
net
/
mac80211
/
ieee80211_i.h
diff --git
a/net/mac80211/ieee80211_i.h
b/net/mac80211/ieee80211_i.h
index 6f905f153ed7e43aa5b5c56c791946a93e81e907..a3649a86a784fc088bd6d32927e59d3eb2c288c4 100644
(file)
--- a/
net/mac80211/ieee80211_i.h
+++ b/
net/mac80211/ieee80211_i.h
@@
-855,6
+855,8
@@
struct ieee80211_local {
* this will override whatever chosen by mac80211 internally.
*/
int dynamic_ps_forced_timeout;
+ int dynamic_ps_user_timeout;
+ bool disable_dynamic_ps;
int user_power_level; /* in dBm */
int power_constr_level; /* in dBm */