diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-12-28 21:09:11 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 21:09:11 +0100 |
| commit | ea1e4b842049fcc4741096538114871a74859314 (patch) | |
| tree | c2336ab480ac0fd62e0dc41b391d99c97158dc9c /net/mac80211/main.c | |
| parent | ath9k: Fix TX poll routine (diff) | |
| parent | ps3_gelic_wireless: Fix build failure due to missing WEXT_PRIV (diff) | |
| download | linux-ea1e4b842049fcc4741096538114871a74859314.tar.xz linux-ea1e4b842049fcc4741096538114871a74859314.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 25f52098b636..d4426748ab10 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -543,6 +543,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) * and we need some headroom for passing the frame to monitor * interfaces, but never both at the same time. */ + BUILD_BUG_ON(IEEE80211_TX_STATUS_HEADROOM != + sizeof(struct ieee80211_tx_status_rtap_hdr)); local->tx_headroom = max_t(unsigned int , local->hw.extra_tx_headroom, sizeof(struct ieee80211_tx_status_rtap_hdr)); |