* [PATCH] compat: fix warning in alloc_netdev_mqs
@ 2011-10-06 8:45 Johannes Berg
2011-10-06 15:12 ` Luis R. Rodriguez
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2011-10-06 8:45 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: linux-wireless
From: Johannes Berg <johannes.berg@intel.com>
Depending on the arguments to alloc_netdev_mqs(),
it may give a warning due to the use of max().
Fix the warning with max_t().
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
include/linux/compat-2.6.38.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/include/linux/compat-2.6.38.h b/include/linux/compat-2.6.38.h
index 1f9ab52..06bbd9d 100644
--- a/include/linux/compat-2.6.38.h
+++ b/include/linux/compat-2.6.38.h
@@ -73,7 +73,8 @@ static inline int skb_checksum_start_offset(const struct sk_buff *skb)
/* include/linux/netdevice.h */
#define alloc_netdev_mqs(sizeof_priv, name, setup, txqs, rxqs) \
- alloc_netdev_mq(sizeof_priv, name, setup, max(txqs, rxqs))
+ alloc_netdev_mq(sizeof_priv, name, setup, \
+ max_t(unsigned int, txqs, rxqs))
#define ETH_P_LINK_CTL 0x886c /* HPNA, wlan link local tunnel */
--
1.7.6.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-10-06 15:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-06 8:45 [PATCH] compat: fix warning in alloc_netdev_mqs Johannes Berg
2011-10-06 15:12 ` Luis R. Rodriguez
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox