e1000e: fix checkpatch warning from MINMAX test
authorBruce Allan <bruce.w.allan@intel.com>
Tue, 31 Jan 2012 06:37:17 +0000 (06:37 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 7 Feb 2012 12:15:52 +0000 (04:15 -0800)
WARNING: min() should probably be min_t(unsigned int, 4, skb->data_len)

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/e1000e/netdev.c

index 02efae08ce3bff7f321a85a43f4132aa1cd2d48e..a9f25fcfbfe34ee5d50b5a7f4b942fc0de9ef147 100644 (file)
@@ -5023,7 +5023,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
                if (skb->data_len && (hdr_len == len)) {
                        unsigned int pull_size;
 
-                       pull_size = min((unsigned int)4, skb->data_len);
+                       pull_size = min_t(unsigned int, 4, skb->data_len);
                        if (!__pskb_pull_tail(skb, pull_size)) {
                                e_err("__pskb_pull_tail failed.\n");
                                dev_kfree_skb_any(skb);