diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-17 23:43:17 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-17 23:43:17 +0400 |
| commit | 7916a075571f0ccd0830cf3da293188a8b6045e3 (patch) | |
| tree | 119c5bb9e513c8205efed485c2dc7b8271123326 /net/mac80211/ieee80211_i.h | |
| parent | cf84eb0b09c0f09b4c70a648b9dfeec78be61f07 (diff) | |
| parent | e4e19c031901e95dc7d1cf0a2c9c50525d71651f (diff) | |
| download | linux-7916a075571f0ccd0830cf3da293188a8b6045e3.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
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 953b9e294547..3701930c6649 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1800,6 +1800,8 @@ ieee80211_cs_get(struct ieee80211_local *local, u32 cipher, int ieee80211_cs_headroom(struct ieee80211_local *local, struct cfg80211_crypto_settings *crypto, enum nl80211_iftype iftype); +void ieee80211_recalc_dtim(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata); #ifdef CONFIG_MAC80211_NOINLINE #define debug_noinline noinline |