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

Commit 7d95b717 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igb: increase minimum rx buffer size to 1K 



This update increases the minimum rx buffer size to 1K.  The reason for this
change is to support SR-IOV and avoid any conflicts with the rings being able
to set their own MTU sizes.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 094919a4

drivers/net/igb/igb.h

+0 −2
Original line number Diff line number Diff line
@@ -96,8 +96,6 @@ struct vf_data_storage { 


/* Supported Rx Buffer Sizes */

#define IGB_RXBUFFER_128   128    /* Used for packet split */

#define IGB_RXBUFFER_256   256    /* Used for packet split */

#define IGB_RXBUFFER_512   512

#define IGB_RXBUFFER_1024  1024

#define IGB_RXBUFFER_2048  2048

#define IGB_RXBUFFER_16384 16384

drivers/net/igb/igb_main.c

+3 −22
Original line number Diff line number Diff line
@@ -2233,18 +2233,8 @@ static void igb_setup_rctl(struct igb_adapter *adapter) 
		rctl |= E1000_RCTL_LPE;



	/* Setup buffer sizes */

	switch (adapter->rx_buffer_len) {

	case IGB_RXBUFFER_256:

		rctl |= E1000_RCTL_SZ_256;

		break;

	case IGB_RXBUFFER_512:

		rctl |= E1000_RCTL_SZ_512;

		break;

	default:

	srrctl = ALIGN(adapter->rx_buffer_len, 1024)

	         >> E1000_SRRCTL_BSIZEPKT_SHIFT;

		break;

	}



	/* 82575 and greater support packet-split where the protocol

	 * header is placed in skb->data and the packet data is
@@ -3755,11 +3745,7 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu) 
	 * i.e. RXBUFFER_2048 --> size-4096 slab

	 */



	if (max_frame <= IGB_RXBUFFER_256)

		adapter->rx_buffer_len = IGB_RXBUFFER_256;

	else if (max_frame <= IGB_RXBUFFER_512)

		adapter->rx_buffer_len = IGB_RXBUFFER_512;

	else if (max_frame <= IGB_RXBUFFER_1024)

	if (max_frame <= IGB_RXBUFFER_1024)

		adapter->rx_buffer_len = IGB_RXBUFFER_1024;

	else if (max_frame <= IGB_RXBUFFER_2048)

		adapter->rx_buffer_len = IGB_RXBUFFER_2048;
@@ -3770,11 +3756,6 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu) 
		adapter->rx_buffer_len = PAGE_SIZE / 2;

#endif



	/* if sr-iov is enabled we need to force buffer size to 1K or larger */

	if (adapter->vfs_allocated_count &&

	    (adapter->rx_buffer_len < IGB_RXBUFFER_1024))

		adapter->rx_buffer_len = IGB_RXBUFFER_1024;



	/* adjust allocation if LPE protects us, and we aren't using SBP */

	if ((max_frame == ETH_FRAME_LEN + ETH_FCS_LEN) ||

	     (max_frame == MAXIMUM_ETHERNET_VLAN_SIZE))