diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
| commit | ea1e4b842049fcc4741096538114871a74859314 (patch) | |
| tree | c2336ab480ac0fd62e0dc41b391d99c97158dc9c /net/mac80211/main.c | |
| parent | b6ce5c33001b1dc83e6a1a6f30c5dccccea651b6 (diff) | |
| parent | 92c6f8d849178582fc527aaf1e51dd37a74767d3 (diff) | |
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) | |||
| 543 | * and we need some headroom for passing the frame to monitor | 543 | * and we need some headroom for passing the frame to monitor |
| 544 | * interfaces, but never both at the same time. | 544 | * interfaces, but never both at the same time. |
| 545 | */ | 545 | */ |
| 546 | BUILD_BUG_ON(IEEE80211_TX_STATUS_HEADROOM != | ||
| 547 | sizeof(struct ieee80211_tx_status_rtap_hdr)); | ||
| 546 | local->tx_headroom = max_t(unsigned int , local->hw.extra_tx_headroom, | 548 | local->tx_headroom = max_t(unsigned int , local->hw.extra_tx_headroom, |
| 547 | sizeof(struct ieee80211_tx_status_rtap_hdr)); | 549 | sizeof(struct ieee80211_tx_status_rtap_hdr)); |
| 548 | 550 | ||