diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2012-01-31 07:37:17 +0100 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-02-07 13:15:52 +0100 |
| commit | a2a5b3235d0dce0feaadf4e76727adea1caa6869 (patch) | |
| tree | 9b9ce082fe346c44e1f9f662e3280b5c9fcccbf5 /drivers/net/ethernet/intel/e1000e | |
| parent | e1000e: cleanup - use braces in both branches of a conditional statement (diff) | |
| download | linux-a2a5b3235d0dce0feaadf4e76727adea1caa6869.tar.xz linux-a2a5b3235d0dce0feaadf4e76727adea1caa6869.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e')
| -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, 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); |