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

Commit 9b08beba authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by David S. Miller
Browse files

netxen: fix skb alloc size for legacy firmware 



Request 1532 bytes skb data size for NX3031. NX2031 firmware
needs 1760 sized buffers.

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f17443f4

drivers/net/netxen/netxen_nic.h

+3 −8
Original line number Diff line number Diff line
@@ -143,18 +143,13 @@ 
#define NX_ETHERMTU                    1500

#define NX_MAX_ETHERHDR                32 /* This contains some padding */



#define NX_RX_NORMAL_BUF_MAX_LEN       (NX_MAX_ETHERHDR + NX_ETHERMTU)

#define NX_P2_RX_BUF_MAX_LEN           1760

#define NX_P3_RX_BUF_MAX_LEN           (NX_MAX_ETHERHDR + NX_ETHERMTU)

#define NX_P2_RX_JUMBO_BUF_MAX_LEN     (NX_MAX_ETHERHDR + P2_MAX_MTU)

#define NX_P3_RX_JUMBO_BUF_MAX_LEN     (NX_MAX_ETHERHDR + P3_MAX_MTU)

#define NX_CT_DEFAULT_RX_BUF_LEN	2048



#define MAX_RX_BUFFER_LENGTH		1760

#define MAX_RX_JUMBO_BUFFER_LENGTH 	8062

#define MAX_RX_LRO_BUFFER_LENGTH	(8062)

#define RX_DMA_MAP_LEN			(MAX_RX_BUFFER_LENGTH - 2)

#define RX_JUMBO_DMA_MAP_LEN	\

	(MAX_RX_JUMBO_BUFFER_LENGTH - 2)

#define RX_LRO_DMA_MAP_LEN		(MAX_RX_LRO_BUFFER_LENGTH - 2)

#define NX_RX_LRO_BUFFER_LENGTH		(8060)



/*

 * Maximum number of ring contexts

drivers/net/netxen/netxen_nic_init.c

+9 −4
Original line number Diff line number Diff line
@@ -247,9 +247,14 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter) 
				rds_ring->skb_size =

					NX_CT_DEFAULT_RX_BUF_LEN;

			} else {

				rds_ring->dma_size = RX_DMA_MAP_LEN;

				if (NX_IS_REVISION_P3(adapter->ahw.revision_id))

					rds_ring->dma_size =

						NX_P3_RX_BUF_MAX_LEN;

				else

					rds_ring->dma_size =

						NX_P2_RX_BUF_MAX_LEN;

				rds_ring->skb_size =

					MAX_RX_BUFFER_LENGTH;

					rds_ring->dma_size + NET_IP_ALIGN;

			}

			break;
@@ -267,8 +272,8 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter) 


		case RCV_RING_LRO:

			rds_ring->num_desc = adapter->num_lro_rxd;

			rds_ring->dma_size = RX_LRO_DMA_MAP_LEN;

			rds_ring->skb_size = MAX_RX_LRO_BUFFER_LENGTH;

			rds_ring->dma_size = NX_RX_LRO_BUFFER_LENGTH;

			rds_ring->skb_size = rds_ring->dma_size + NET_IP_ALIGN;

			break;



		}