[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070718171044.2de287cd@griffin.suse.cz>
Date: Wed, 18 Jul 2007 17:10:44 +0200
From: Jiri Benc <jbenc@...e.cz>
To: David Miller <davem@...emloft.net>
Cc: linville@...driver.com, linux-wireless@...r.kernel.org,
netdev@...r.kernel.org
Subject: [PATCH v2] 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 <jbenc@...e.cz>
---
On Mon, 16 Jul 2007 14:53:58 -0700 (PDT), David Miller wrote:
> The macro "max_t" exists for these kinds of situations, please
> use it. :-)
Ok.
---
net/mac80211/ieee80211.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- mac80211-2.6.orig/net/mac80211/ieee80211.c
+++ mac80211-2.6/net/mac80211/ieee80211.c
@@ -4986,8 +4986,8 @@ int ieee80211_register_hw(struct ieee802
* 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, local->hw.extra_tx_headroom,
+ sizeof(struct ieee80211_tx_status_rtap_hdr));
debugfs_hw_add(local);
--
Jiri Benc
SUSE Labs
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists