From 5f6946a25697f80684378950dd7429fedfa46047 Mon Sep 17 00:00:00 2001 From: Jiri Benc Date: Wed, 18 Jul 2007 17:10:44 +0200 Subject: [PATCH] --- yaml --- r: 61745 b: refs/heads/master c: 33ccad35a21df51c0d23f3e3e88688524e7b51ed h: refs/heads/master i: 61743: 024c44dc53299ff1065edae75ebf2cd6b8348814 v: v3 --- [refs] | 2 +- trunk/net/mac80211/ieee80211.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 39d9bafa711f..acc1e013d284 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b8857a3bb93a94230fd205be784b01fa1932c47 +refs/heads/master: 33ccad35a21df51c0d23f3e3e88688524e7b51ed diff --git a/trunk/net/mac80211/ieee80211.c b/trunk/net/mac80211/ieee80211.c index 6c63dcf9f1ec..c944b17d0fc0 100644 --- a/trunk/net/mac80211/ieee80211.c +++ b/trunk/net/mac80211/ieee80211.c @@ -4986,8 +4986,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. */ - local->tx_headroom = max(local->hw.extra_tx_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)); debugfs_hw_add(local);