Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a50c29dd authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Make certain that all frames fit minimum size requirements 



This change makes certain that any packet we attempt to transmit will meet
minimum size requirements for the hardware.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 655309e9

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+17 −1
Original line number Diff line number Diff line
@@ -7162,11 +7162,27 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, 
	return NETDEV_TX_OK;

}



static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)

static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb,

				    struct net_device *netdev)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_ring *tx_ring;



	if (skb->len <= 0) {

		dev_kfree_skb_any(skb);

		return NETDEV_TX_OK;

	}



	/*

	 * The minimum packet size for olinfo paylen is 17 so pad the skb

	 * in order to meet this minimum size requirement.

	 */

	if (skb->len < 17) {

		if (skb_padto(skb, 17))

			return NETDEV_TX_OK;

		skb->len = 17;

	}



	tx_ring = adapter->tx_ring[skb->queue_mapping];

	return ixgbe_xmit_frame_ring(skb, adapter, tx_ring);

}