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

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

ixgbe: Drop check for PAGE_SIZE from ixgbe_xmit_frame_ring 



The check for PAGE_SIZE is pointless now that the default configuration is to
allocate 32K for all buffers.  Since the Tx descriptor limit is 16K we can
just drop the check and always compare the descriptors to the maximum size
supported.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d0111575

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

+1 −6
Original line number Diff line number Diff line
@@ -6425,9 +6425,7 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, 
	struct ixgbe_tx_buffer *first;

	int tso;

	u32 tx_flags = 0;

#if PAGE_SIZE > IXGBE_MAX_DATA_PER_TXD

	unsigned short f;

#endif

	u16 count = TXD_USE_COUNT(skb_headlen(skb));

	__be16 protocol = skb->protocol;

	u8 hdr_len = 0;
@@ -6439,12 +6437,9 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, 
	 *       + 1 desc for context descriptor,

	 * otherwise try next time

	 */

#if PAGE_SIZE > IXGBE_MAX_DATA_PER_TXD

	for (f = 0; f < skb_shinfo(skb)->nr_frags; f++)

		count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size);

#else

	count += skb_shinfo(skb)->nr_frags;

#endif



	if (ixgbe_maybe_stop_tx(tx_ring, count + 3)) {

		tx_ring->tx_stats.tx_busy++;

		return NETDEV_TX_BUSY;