diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-01 20:34:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-01 20:34:14 -0400 |
| commit | 05318bc905467237d4aa68a701f6e92a2b332218 (patch) | |
| tree | 3b7577383bca50aeb442568aa16cf8f2167b8694 /net/mac80211/ieee80211_i.h | |
| parent | ea812ca1b06113597adcd8e70c0f84a413d97544 (diff) | |
| parent | 88c1f4f6dffe66e2fed8e7e3276e091ee850bed0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/libertas/host.h
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 6f905f153ed7..a3649a86a784 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
| @@ -855,6 +855,8 @@ struct ieee80211_local { | |||
| 855 | * this will override whatever chosen by mac80211 internally. | 855 | * this will override whatever chosen by mac80211 internally. |
| 856 | */ | 856 | */ |
| 857 | int dynamic_ps_forced_timeout; | 857 | int dynamic_ps_forced_timeout; |
| 858 | int dynamic_ps_user_timeout; | ||
| 859 | bool disable_dynamic_ps; | ||
| 858 | 860 | ||
| 859 | int user_power_level; /* in dBm */ | 861 | int user_power_level; /* in dBm */ |
| 860 | int power_constr_level; /* in dBm */ | 862 | int power_constr_level; /* in dBm */ |