From ce559888dfb6c9e19b10d981a5cece4e7972e4a1 Mon Sep 17 00:00:00 2001
From: Wu Fengguang <fengguang.wu@intel.com>
Date: Tue, 14 Apr 2009 21:53:48 -0700
Subject: [PATCH] --- yaml --- r: 143461 b: refs/heads/master c:
 95615d90a321349709c80091f2a9cb284757ff0d h: refs/heads/master i:   143459:
 b581c18d617eab8306770b34e1982e91dd43b484 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/ixgbe/ixgbe_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4e5cd255d26b..59300d7d64c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fd4777a1fec1f7757b5a302ad3fdcc1eae2abba
+refs/heads/master: 95615d90a321349709c80091f2a9cb284757ff0d
diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c
index 9ef128ae6458..862dd344533e 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_main.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_main.c
@@ -4342,7 +4342,7 @@ static int ixgbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 	int count = 0;
 	unsigned int f;
 
-	r_idx = (adapter->num_tx_queues - 1) & skb->queue_mapping;
+	r_idx = skb->queue_mapping;
 	tx_ring = &adapter->tx_ring[r_idx];
 
 	if (adapter->vlgrp && vlan_tx_tag_present(skb)) {