Return-path: Received: from styx.suse.cz ([82.119.242.94]:53461 "EHLO mail.suse.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754175AbXGRPK3 (ORCPT ); Wed, 18 Jul 2007 11:10:29 -0400 Date: Wed, 18 Jul 2007 17:10:44 +0200 From: Jiri Benc To: David Miller Cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2] mac80211: fix GCC warning on 64bit platforms Message-ID: <20070718171044.2de287cd@griffin.suse.cz> In-Reply-To: <20070716.145358.35015496.davem@davemloft.net> References: <20070714.185935.18577806.davem@davemloft.net> <20070714.204116.23012949.davem@davemloft.net> <20070716184653.355253bf@griffin.suse.cz> <20070716.145358.35015496.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-wireless-owner@vger.kernel.org List-ID: 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 --- 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