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

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

fm10k: Don't assume page fragments are page size 



This change pulls out the optimization that assumed that all fragments
would be limited to page size.  That hasn't been the case for some time now
and to assume this is incorrect as the TCP allocator can provide up to a
32K page fragment.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@redhat.com>
Acked-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent bdc7f590

drivers/net/ethernet/intel/fm10k/fm10k_main.c

+1 −6
Original line number Diff line number Diff line
@@ -1079,9 +1079,7 @@ netdev_tx_t fm10k_xmit_frame_ring(struct sk_buff *skb, 
	struct fm10k_tx_buffer *first;

	int tso;

	u32 tx_flags = 0;

#if PAGE_SIZE > FM10K_MAX_DATA_PER_TXD

	unsigned short f;

#endif

	u16 count = TXD_USE_COUNT(skb_headlen(skb));



	/* need: 1 descriptor per page * PAGE_SIZE/FM10K_MAX_DATA_PER_TXD,
@@ -1089,12 +1087,9 @@ netdev_tx_t fm10k_xmit_frame_ring(struct sk_buff *skb, 
	 *       + 2 desc gap to keep tail from touching head

	 * otherwise try next time

	 */

#if PAGE_SIZE > FM10K_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 (fm10k_maybe_stop_tx(tx_ring, count + 3)) {

		tx_ring->tx_stats.tx_busy++;

		return NETDEV_TX_BUSY;