netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Yongjian Xu <xuyongjiande@gmail.com>,
	netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 6/7] e1000: remove the check: skb->len<=0
Date: Wed,  4 Jun 2014 00:04:59 -0700	[thread overview]
Message-ID: <1401865500-18081-7-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1401865500-18081-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Yongjian Xu <xuyongjiande@gmail.com>

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>
---
 drivers/net/ethernet/intel/e1000/e1000_main.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 27058df..660971f 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.
-- 
1.9.3

  parent reply	other threads:[~2014-06-04  7:05 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-04  7:04 [net-next v2 0/7][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2014-06-04  7:04 ` [net-next v2 1/7] ixgbe: fix detection of SFP+ capable interfaces Jeff Kirsher
2014-06-04  7:04 ` [net-next v2 2/7] ixgbe: remove linux/export.h header from ixgbe_ptp.c Jeff Kirsher
2014-06-04  7:04 ` [net-next v2 3/7] igb: rename igb_ptp_enable to igb_ptp_feature_enable Jeff Kirsher
2014-06-04  7:04 ` [net-next v2 4/7] igb: use mac loopback for i354 backplane Jeff Kirsher
2014-06-04  7:04 ` [net-next v2 5/7] igb: add defaults for i210 TX/RX PBSIZE Jeff Kirsher
2014-06-04  7:04 ` Jeff Kirsher [this message]
2014-06-04  7:05 ` [net-next v2 7/7] e1000: Use time_after() for time comparison Jeff Kirsher
2014-06-04 21:40 ` [net-next v2 0/7][pull request] Intel Wired LAN Driver Updates David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1401865500-18081-7-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=gospo@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=sassmann@redhat.com \
    --cc=xuyongjiande@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).