summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlexander Duyck <aduyck@mirantis.com>2016-01-07 08:11:26 +0100
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2016-02-16 01:46:15 +0100
commit9c2f186e45faa34d5f6ff52aa84c361d4be72288 (patch)
tree08a1e639afdf6e97f6d3f91c2791a6f76fab29ab /drivers
parentigb: Add support for VLAN promiscuous with SR-IOV and NTUPLE (diff)
downloadlinux-9c2f186e45faa34d5f6ff52aa84c361d4be72288.tar.xz
linux-9c2f186e45faa34d5f6ff52aa84c361d4be72288.zip
igb: Drop unnecessary checks in transmit path
This patch drops several checks that we dropped from ixgbe some ago. It should not be possible for us to be called with either of the conditional statements returning true so we can just drop them from the hot-path. Signed-off-by: Alexander Duyck <aduyck@mirantis.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 7366d4ff0400..bb5be404a56a 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -5193,16 +5193,6 @@ static netdev_tx_t igb_xmit_frame(struct sk_buff *skb,
{
struct igb_adapter *adapter = netdev_priv(netdev);
- if (test_bit(__IGB_DOWN, &adapter->state)) {
- dev_kfree_skb_any(skb);
- return NETDEV_TX_OK;
- }
-
- if (skb->len <= 0) {
- dev_kfree_skb_any(skb);
- return NETDEV_TX_OK;
- }
-
/* The minimum packet size with TCTL.PSP set is 17 so pad the skb
* in order to meet this minimum size requirement.
*/