--- drivers/net/ixgbe/ixgbe_main.c

+++ drivers/net/ixgbe/ixgbe_main.c

@@ -96,6 +96,8 @@ static struct pci_device_id ixgbe_pci_tb

board_82599 },

{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_XAUI_LOM),

board_82599 },

+ {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KR),

+ board_82599 },

{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP),

board_82599 },

{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4_MEZZ),

@@ -5239,9 +5241,13 @@ static int ixgbe_maybe_stop_tx(struct ne

static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb)

{

struct ixgbe_adapter *adapter = netdev_priv(dev);

+ int txq = smp_processor_id();

- if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)

- return smp_processor_id();

+ if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {

+ while (unlikely(txq >= dev->real_num_tx_queues))

+ txq -= dev->real_num_tx_queues;

+ return txq;

+ }

if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)

return (skb->vlan_tci & IXGBE_TX_FLAGS_VLAN_PRIO_MASK) >> 13;