Commit:     33ccad35a21df51c0d23f3e3e88688524e7b51ed
Parent:     8b8857a3bb93a94230fd205be784b01fa1932c47
Author:     Jiri Benc <[EMAIL PROTECTED]>
AuthorDate: Wed Jul 18 17:10:44 2007 +0200
Committer:  John W. Linville <[EMAIL PROTECTED]>
CommitDate: Wed Jul 18 20:35:42 2007 -0400

    [PATCH] mac80211: fix GCC warning on 64bit platforms
    net/mac80211/ieee80211.c: In function ieee80211_register_hw:
    net/mac80211/ieee80211.c:4989: warning: comparison of distinct pointer 
types lacks a cast
    Size of ieee80211_tx_status_rtap_hdr structure will never be greater than
    unsigned int.
    Signed-off-by: Jiri Benc <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
 net/mac80211/ieee80211.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 6c63dcf..c944b17 100644
--- a/net/mac80211/ieee80211.c
+++ b/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));
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to