Commit 4c6de2fe authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net-next 

Peter P Waskiewicz Jr says:

====================
This series contains multiple updates to the ixgbe driver.

The following are changes since commit 02644a17:
    sctp: fix bogus if statement in sctp_auth_recv_cid()

and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net-next

 master

Alexander Duyck (9):
  ixgbe: Remove code that was initializing Rx page offset
  ixgbe: combine ixgbe_add_rx_frag and ixgbe_can_reuse_page
  ixgbe: Only use double buffering if page size is less than 8K
  ixgbe: Have the CPU take ownership of the buffers sooner
  ixgbe: Make pull tail function separate from rest of cleanup_headers
  ixgbe: Copybreak sooner to avoid get_page/put_page and offset change
    overhead
  ixgbe: Make allocating skb and placing data in it a separate function
  ixgbe: Roll RSC code into non-EOP code
  ixgbe: Rewrite code related to configuring IFCS bit in Tx descriptor
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e6a04b1d 62748b7b

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+19 −6
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ 


/* Supported Rx Buffer Sizes */

#define IXGBE_RXBUFFER_256    256  /* Used for skb receive header */

#define IXGBE_RXBUFFER_2K    2048

#define IXGBE_RXBUFFER_3K    3072

#define IXGBE_RXBUFFER_4K    4096

#define IXGBE_MAX_RXBUFFER  16384  /* largest size for a single descriptor */



/*
@@ -104,6 +107,7 @@ 
#define IXGBE_TX_FLAGS_FSO		(u32)(1 << 6)

#define IXGBE_TX_FLAGS_TXSW		(u32)(1 << 7)

#define IXGBE_TX_FLAGS_TSTAMP		(u32)(1 << 8)

#define IXGBE_TX_FLAGS_NO_IFCS		(u32)(1 << 9)

#define IXGBE_TX_FLAGS_VLAN_MASK	0xffff0000

#define IXGBE_TX_FLAGS_VLAN_PRIO_MASK	0xe0000000

#define IXGBE_TX_FLAGS_VLAN_PRIO_SHIFT  29
@@ -293,16 +297,25 @@ struct ixgbe_ring_feature { 
 * this is twice the size of a half page we need to double the page order

 * for FCoE enabled Rx queues.

 */

#if defined(IXGBE_FCOE) && (PAGE_SIZE < 8192)

static inline unsigned int ixgbe_rx_pg_order(struct ixgbe_ring *ring)

static inline unsigned int ixgbe_rx_bufsz(struct ixgbe_ring *ring)

{

	return test_bit(__IXGBE_RX_FCOE, &ring->state) ? 1 : 0;

#ifdef IXGBE_FCOE

	if (test_bit(__IXGBE_RX_FCOE, &ring->state))

		return (PAGE_SIZE < 8192) ? IXGBE_RXBUFFER_4K :

					    IXGBE_RXBUFFER_3K;

#endif

	return IXGBE_RXBUFFER_2K;

}

#else

#define ixgbe_rx_pg_order(_ring) 0



static inline unsigned int ixgbe_rx_pg_order(struct ixgbe_ring *ring)

{

#ifdef IXGBE_FCOE

	if (test_bit(__IXGBE_RX_FCOE, &ring->state))

		return (PAGE_SIZE < 8192) ? 1 : 0;

#endif

	return 0;

}

#define ixgbe_rx_pg_size(_ring) (PAGE_SIZE << ixgbe_rx_pg_order(_ring))

#define ixgbe_rx_bufsz(_ring) ((PAGE_SIZE / 2) << ixgbe_rx_pg_order(_ring))



struct ixgbe_ring_container {

	struct ixgbe_ring *ring;	/* pointer to linked list of rings */

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

+265 −232

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE