diff options
author | Scott Feldman <scofeldm@cisco.com> | 2009-09-03 13:02:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-03 23:19:19 -0400 |
commit | 6ba9cdc09678d6925c205ef0b0bd374e31589ecf (patch) | |
tree | cff6128e997b6945d77ad47dab3a23bc8de8a56a /drivers/net/enic/enic_main.c | |
parent | 350991e12ac1ac407850169a0d65f522a7fd029e (diff) |
enic: provision for multiple Rx/Tx queues; prepare for RSS support
Provision for multiple Rx/Tx queues. Max of 8 WQs and 8 RQs. Max for
completion queue is 8+8=16 and max for interrupt resources is 8+8+2.
Add driver/firmware interface for setting up RSS secret key and indirection
table.
Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/enic/enic_main.c')
-rw-r--r-- | drivers/net/enic/enic_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index b265b103c210..e01067e727b2 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c | |||
@@ -1586,7 +1586,7 @@ static int enic_set_niccfg(struct enic *enic) | |||
1586 | const u8 ig_vlan_strip_en = 1; | 1586 | const u8 ig_vlan_strip_en = 1; |
1587 | 1587 | ||
1588 | /* Enable VLAN tag stripping. RSS not enabled (yet). | 1588 | /* Enable VLAN tag stripping. RSS not enabled (yet). |
1589 | */ | 1589 | */ |
1590 | 1590 | ||
1591 | return enic_set_nic_cfg(enic, | 1591 | return enic_set_nic_cfg(enic, |
1592 | rss_default_cpu, rss_hash_type, | 1592 | rss_default_cpu, rss_hash_type, |
@@ -1621,8 +1621,8 @@ static void enic_reset(struct work_struct *work) | |||
1621 | 1621 | ||
1622 | static int enic_set_intr_mode(struct enic *enic) | 1622 | static int enic_set_intr_mode(struct enic *enic) |
1623 | { | 1623 | { |
1624 | unsigned int n = ARRAY_SIZE(enic->rq); | 1624 | unsigned int n = 1; |
1625 | unsigned int m = ARRAY_SIZE(enic->wq); | 1625 | unsigned int m = 1; |
1626 | unsigned int i; | 1626 | unsigned int i; |
1627 | 1627 | ||
1628 | /* Set interrupt mode (INTx, MSI, MSI-X) depending | 1628 | /* Set interrupt mode (INTx, MSI, MSI-X) depending |