From: Johannes Berg Date: Thu, 6 Oct 2011 08:45:26 +0000 (+0200) Subject: Depending on the arguments to alloc_netdev_mqs(), X-Git-Tag: compat-2011-11-08~2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b5edac3c763cc8562b77c1599153ab778cac4649;p=~emulex%2Ffor-vlad%2Fold%2Fcompat.git 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 --- diff --git a/include/linux/compat-2.6.38.h b/include/linux/compat-2.6.38.h index ad04ebc..63f9dd6 100644 --- 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 */