From: Bruce Allan <bruce.w.allan@intel.com>
Date: Tue, 31 Jan 2012 06:37:17 +0000 (+0000)
Subject: e1000e: fix checkpatch warning from MINMAX test
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~340
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=76f8502c85ba1d92601fb97bc30743a8bf062363;p=users%2Fjedix%2Flinux-maple.git

e1000e: fix checkpatch warning from MINMAX test

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>
---

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 2ec743ec64e8..6afdc2dbdd34 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -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);