diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2012-01-31 01:37:17 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-02-07 07:15:52 -0500 |
commit | a2a5b3235d0dce0feaadf4e76727adea1caa6869 (patch) | |
tree | 9b9ce082fe346c44e1f9f662e3280b5c9fcccbf5 | |
parent | 24b706b2f4bb28c34d32f9d333d8a118215a38cc (diff) |
e1000e: fix checkpatch warning from MINMAX test
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>
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 02efae08ce3b..a9f25fcfbfe3 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -5023,7 +5023,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, | |||
5023 | if (skb->data_len && (hdr_len == len)) { | 5023 | if (skb->data_len && (hdr_len == len)) { |
5024 | unsigned int pull_size; | 5024 | unsigned int pull_size; |
5025 | 5025 | ||
5026 | pull_size = min((unsigned int)4, skb->data_len); | 5026 | pull_size = min_t(unsigned int, 4, skb->data_len); |
5027 | if (!__pskb_pull_tail(skb, pull_size)) { | 5027 | if (!__pskb_pull_tail(skb, pull_size)) { |
5028 | e_err("__pskb_pull_tail failed.\n"); | 5028 | e_err("__pskb_pull_tail failed.\n"); |
5029 | dev_kfree_skb_any(skb); | 5029 | dev_kfree_skb_any(skb); |