]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
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)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 07:32:21 +0000 (15:32 +0800)
WARNING: min() should probably be min_t(unsigned int, 4, skb->data_len)

(cherry picked from commit a2a5b3235d0dce0feaadf4e76727adea1caa6869)
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>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/e1000e/netdev.c

index 2ec743ec64e822f34702ccc1a1924c951ef87580..6afdc2dbdd3401c995b7c35499b2011229a1915c 100644 (file)
@@ -5012,7 +5012,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);