diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-06 19:24:48 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-07 01:53:40 +0530 |
| commit | 72e0b69da32430ad7a26fcb9db45b2551e51f732 (patch) | |
| tree | 9c4f84dfe4e27cb8434646188ae3f160d7ba506b /net/mac80211/ieee80211_i.h | |
| parent | 97caf63d0c837f9b5c9f6f469979e68c0378e83f (diff) | |
Revert "cfg80211: restructure AP/GO mode API"
This reverts commit 8860020e0be1f03d83dc9e9e93e18a4ddbe01038.
Conflicts:
drivers/net/wireless/ath/ath6kl/cfg80211.c
include/linux/nl80211.h
include/net/cfg80211.h
net/wireless/nl80211.c
Change-Id: I4b495d6af3a9c47256aa6e984830dc413ca6631b
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index d9798a307f20..779fdcde9f71 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -266,7 +266,7 @@ struct ieee80211_rx_data { struct beacon_data { u8 *head, *tail; int head_len, tail_len; - struct rcu_head rcu_head; + int dtim_period; }; struct ieee80211_if_ap { |