summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000
diff options
context:
space:
mode:
authorYongjian Xu <xuyongjiande@gmail.com>2014-05-20 08:22:50 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-06-03 23:57:57 -0700
commitc46d15040450c9d6031d90b93382f77419d495ed (patch)
tree8e37a795743b7810fbbbabdf34e0c93c7b012f76 /drivers/net/ethernet/intel/e1000
parent27dff8b2f680ce966b5d959be9d69dd0edd92e3b (diff)
downloadtalos-obmc-linux-c46d15040450c9d6031d90b93382f77419d495ed.tar.gz
talos-obmc-linux-c46d15040450c9d6031d90b93382f77419d495ed.zip
e1000: remove the check: skb->len<=0
There is no case skb->len would be 0 or 'negative'. Remove the check. Signed-off-by: Yongjian Xu <xuyongjiande@gmail.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/e1000')
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_main.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 27058dfe418b..660971f304b2 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -3105,11 +3105,6 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
*/
tx_ring = adapter->tx_ring;
- if (unlikely(skb->len <= 0)) {
- dev_kfree_skb_any(skb);
- return NETDEV_TX_OK;
- }
-
/* On PCI/PCI-X HW, if packet size is less than ETH_ZLEN,
* packets may get corrupted during padding by HW.
* To WA this issue, pad all small packets manually.
OpenPOWER on IntegriCloud