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

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

igb: update handling of RCTL for smaller buffer sizes 



As we begin to move into virtualization the use of a global value for
buffer sizes becomes undesirable.  This change makes it so only 256 and 512
byte buffers require use of the RCTL register.

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 e97fd7c6

drivers/net/igb/igb_main.c

+14 −18
Original line number Diff line number Diff line
@@ -1801,7 +1801,9 @@ static void igb_setup_rctl(struct igb_adapter *adapter) 
	 */

	rctl &= ~(E1000_RCTL_SBP | E1000_RCTL_LPE | E1000_RCTL_SZ_256);



	if (adapter->netdev->mtu <= ETH_DATA_LEN) {

	if (adapter->netdev->mtu > ETH_DATA_LEN)

		rctl |= E1000_RCTL_LPE;



	/* Setup buffer sizes */

	switch (adapter->rx_buffer_len) {

	case IGB_RXBUFFER_256:
@@ -1810,17 +1812,11 @@ static void igb_setup_rctl(struct igb_adapter *adapter) 
	case IGB_RXBUFFER_512:

		rctl |= E1000_RCTL_SZ_512;

		break;

		case IGB_RXBUFFER_1024:

			rctl |= E1000_RCTL_SZ_1024;

			break;

	default:

			rctl |= E1000_RCTL_SZ_2048;

		srrctl = ALIGN(adapter->rx_buffer_len, 1024)

		         >> E1000_SRRCTL_BSIZEPKT_SHIFT;

		break;

	}

	} else {

		rctl |= E1000_RCTL_LPE;

		srrctl = adapter->rx_buffer_len >> E1000_SRRCTL_BSIZEPKT_SHIFT;

	}



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

	 * header is placed in skb->data and the packet data is