[net-next 03/10] ixgbe: fixup remaining call sites for arbitrary TCs

STALE5531d SUPERSEDED: 1 (0M)

From: Jeff Kirsher <hidden>
Date: 2011-08-29 08:41:15
Subsystem: intel ethernet drivers, networking drivers, the rest · Maintainers: Tony Nguyen, Przemek Kitszel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

Revision v1 of 31 in this series; 1 review trailer.

Revisions (31)

2011-04-14 v1
2011-04-27 v1
2011-05-04 v1
2011-05-07 v1
2011-05-15 v1
2011-06-07 v1
2011-06-08 v1
2011-06-10 v2 [diff vs current]
2011-06-11 v1
2011-06-20 v1
2011-06-21 v1
2011-06-23 v1
2011-06-24 v1
2011-06-25 v1
2011-07-09 v1
2011-07-12 v1
2011-07-22 v1
2011-07-22 v2 [diff vs current]
2011-08-04 v1
2011-08-19 v1
2011-08-21 v1
2011-08-27 v1
2011-08-29 v1 current
2011-09-20 v1
2011-09-21 v1
2011-10-12 v1
2011-11-03 v1
2012-02-02 v1
2012-02-03 v2 [diff vs current]
2012-04-04 v1
2012-04-05 v1

From: John Fastabend <redacted>

One existing call sites still expect either 4 or 8 traffic
classes to be specified. This fixes this allowing arbitrary
values up to 8 to work as expected.

Signed-off-by: John Fastabend <redacted>
Tested-by: Ross Brattain <redacted>
Signed-off-by: Jeff Kirsher <redacted>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index f095a3b..2b1bb60 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

@@ -4481,7 +4481,7 @@ static void ixgbe_get_first_reg_idx(struct ixgbe_adapter *adapter, u8 tc,
 		break;
 	case ixgbe_mac_82599EB:
 	case ixgbe_mac_X540:
-		if (num_tcs == 8) {
+		if (num_tcs > 4) {
 			if (tc < 3) {
 				*tx = tc << 5;
 				*rx = tc << 4;

@@ -4492,7 +4492,7 @@ static void ixgbe_get_first_reg_idx(struct ixgbe_adapter *adapter, u8 tc,
 				*tx = ((tc + 8) << 3);
 				*rx = tc << 4;
 			}
-		} else if (num_tcs == 4) {
+		} else {
 			*rx =  tc << 5;
 			switch (tc) {
 			case 0:

-- 
1.7.6

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help