Merge branch 'ibmvnic-Fix-and-increase-maximum-TX-RX-queues'

davem330 · davem330 · commit 61afe07ad68e · 2017-12-19T14:08:20.000-05:00
Thomas Falcon says:

====================
ibmvnic: Fix and increase maximum TX/RX queues

This series renames IBMVNIC_MAX_TX_QUEUES to IBMVNIC_MAX_QUEUES since
it is used to allocate both RX and TX queues. The value is also increased
to accommodate newer hardware.
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -4285,7 +4285,7 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
 	}
 
 	netdev = alloc_etherdev_mq(sizeof(struct ibmvnic_adapter),
-				   IBMVNIC_MAX_TX_QUEUES);
+				   IBMVNIC_MAX_QUEUES);
 	if (!netdev)
 		return -ENOMEM;
 
diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h
@@ -39,7 +39,7 @@
 #define IBMVNIC_RX_WEIGHT		16
 /* when changing this, update IBMVNIC_IO_ENTITLEMENT_DEFAULT */
 #define IBMVNIC_BUFFS_PER_POOL	100
-#define IBMVNIC_MAX_TX_QUEUES	5
+#define IBMVNIC_MAX_QUEUES	10
 
 #define IBMVNIC_TSO_BUF_SZ	65536
 #define IBMVNIC_TSO_BUFS	64

Original file line number	Diff line number	Diff line change
`@@ -4285,7 +4285,7 @@ static int ibmvnic_probe(struct vio_dev dev, const struct vio_device_id id)`
`4285`	`4285`	`}`
`4286`	`4286`
`4287`	`4287`	`netdev = alloc_etherdev_mq(sizeof(struct ibmvnic_adapter),`
`4288`		`- IBMVNIC_MAX_TX_QUEUES);`
	`4288`	`+ IBMVNIC_MAX_QUEUES);`
`4289`	`4289`	`if (!netdev)`
`4290`	`4290`	`return -ENOMEM;`
`4291`	`4291`