From a08fab289f040b62382c4dddc0039eec892f5200 Mon Sep 17 00:00:00 2001 From: John Fastabend Date: Mon, 18 Jul 2011 22:38:25 +0000 Subject: [PATCH] --- yaml --- r: 265591 b: refs/heads/master c: 4fa2e0e178b23819283839b64dcb56f0f259ba39 h: refs/heads/master i: 265589: b1f1a6fd59b4a87322267bf83e3d0c5e23b1eaaf 265587: e92ca6763b7b795e534a187a4fe9dce0ae313bae 265583: 2f7c46fb4ce123fa79af0143d95ee8e10454fcc3 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eac7f9287bac..b5107c5c775b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09dca476e3201baac2dcbddc857b83aa25cbdf2e +refs/heads/master: 4fa2e0e178b23819283839b64dcb56f0f259ba39 diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index f095a3b479d7..2b1bb606c638 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/trunk/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: