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>

diff --git a/include/linux/compat-2.6.38.h b/include/linux/compat-2.6.38.h
index ad04ebcc988de42ac327d1d2016affc9c074d127..63f9dd6a0ef56b5618f27204c9e06d7ca8b6386f 100644 (file)
--- a/include/linux/compat-2.6.38.h
+++ b/include/linux/compat-2.6.38.h
@@ -74,7 +74,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 */