diff options
| author |   David S. Miller <davem@davemloft.net> | 2008-08-05 01:28:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-05 01:28:35 -0700 |
| commit | 33e334950abda8e42c3b6e6f280fad0d4ab92141 (patch) | |
| tree | 7d52e5d4772f578c499200f38cfc54b79e3357fb /net/mac80211/ieee80211_i.h | |
| parent | bridge: fix compile warning in net/bridge/br_netfilter.c (diff) | |
| parent | iwl3945: fix merge mistake for packet injection (diff) | |
| download | linux-dev-33e334950abda8e42c3b6e6f280fad0d4ab92141.tar.xz linux-dev-33e334950abda8e42c3b6e6f280fad0d4ab92141.zip | |
Merge branch 'no-ath9k' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index a2e200f9811e..ec59345af65b 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -82,6 +82,7 @@ struct ieee80211_sta_bss { u8 bssid[ETH_ALEN]; u8 ssid[IEEE80211_MAX_SSID_LEN]; + u8 dtim_period; u16 capability; /* host byte order */ enum ieee80211_band band; int freq; |