]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] mac80211: fix GCC warning on 64bit platforms
authorJiri Benc <jbenc@suse.cz>
Wed, 18 Jul 2007 15:10:44 +0000 (17:10 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 19 Jul 2007 00:35:42 +0000 (20:35 -0400)
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 <jbenc@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/ieee80211.c

index 6c63dcf9f1ec175b171dafcf5ea014c0977813fc..c944b17d0fc0c0c51e22a943774f8b6e3779af02 100644 (file)
@@ -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);