diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-12-19 14:08:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-19 14:08:20 -0500 |
| commit | 61afe07ad68e3c0b6672e65f4239a759491ccc58 (patch) | |
| tree | 8aacbe2822fd057021ee5e10fb4f29b3edc49029 | |
| parent | Merge tag 'wireless-drivers-next-for-davem-2017-12-18' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next (diff) | |
| parent | ibmvnic: Increase maximum number of RX/TX queues (diff) | |
| download | linux-dev-61afe07ad68e3c0b6672e65f4239a759491ccc58.tar.xz linux-dev-61afe07ad68e3c0b6672e65f4239a759491ccc58.zip | |
Merge branch 'ibmvnic-Fix-and-increase-maximum-TX-RX-queues'
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 <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 1dc4aef37d3a..df6d91116b65 100644 --- 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 index 4487f1e2c266..2df79fdd800b 100644 --- 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 |