From 143ab9399f7070d96d1f9976cf36657bc3f6996d Mon Sep 17 00:00:00 2001 From: Sathya Perla Date: Sun, 26 Jun 2011 20:41:25 +0000 Subject: [PATCH] --- yaml --- r: 255941 b: refs/heads/master c: c814fd3669b43f32ddd505178705c02352b0ac7c h: refs/heads/master i: 255939: cb8714dfe2e949cb2baa981276f836ec30a00166 v: v3 --- [refs] | 2 +- trunk/drivers/net/benet/be_main.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8646a9cfd3a5..af5e61ddc715 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e53391cb4f9491182e7fbd280966ebe2aca07dc +refs/heads/master: c814fd3669b43f32ddd505178705c02352b0ac7c diff --git a/trunk/drivers/net/benet/be_main.c b/trunk/drivers/net/benet/be_main.c index 5ca06b0d2d0c..2373d394fa71 100644 --- a/trunk/drivers/net/benet/be_main.c +++ b/trunk/drivers/net/benet/be_main.c @@ -33,10 +33,6 @@ module_param(num_vfs, uint, S_IRUGO); MODULE_PARM_DESC(rx_frag_size, "Size of a fragment that holds rcvd data."); MODULE_PARM_DESC(num_vfs, "Number of PCI VFs to initialize"); -static bool multi_rxq = true; -module_param(multi_rxq, bool, S_IRUGO | S_IWUSR); -MODULE_PARM_DESC(multi_rxq, "Multi Rx Queue support. Enabled by default"); - static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = { { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) }, { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) }, @@ -1785,7 +1781,7 @@ static void be_rx_queues_destroy(struct be_adapter *adapter) static u32 be_num_rxqs_want(struct be_adapter *adapter) { - if (multi_rxq && (adapter->function_caps & BE_FUNCTION_CAPS_RSS) && + if ((adapter->function_caps & BE_FUNCTION_CAPS_RSS) && !adapter->sriov_enabled && !(adapter->function_mode & 0x400)) { return 1 + MAX_RSS_QS; /* one default non-RSS queue */ } else {