---

yaml --- r: 61745 b: refs/heads/master c: 33ccad3 h: refs/heads/master i: 61743: 024c44d v: v3
git-mirror · Jul 19, 2007 · 5f6946a · 5f6946a
1 parent 0ba3051
commit 5f6946a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);