From af6a385ab2c8afa6c57481fffad86e453aa4d0a7 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Wed, 19 Jan 2011 18:33:05 +0000 Subject: [PATCH] --- yaml --- r: 233079 b: refs/heads/master c: 96cc637235892a102fb829218adac048bd730ab7 h: refs/heads/master i: 233077: 34c556fbda57ce5847400f878dcb08763bf5df03 233075: a20ed4d5c63849c53cc38bb6c83720211bf07fcc 233071: 2daee7eb30a8f8d8ba0a18cc0426e473b4aa250a v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_common.c | 3 +++ trunk/drivers/net/ixgbe/ixgbe_sriov.c | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b8a742aa6c57..4c42227e29c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a124339ad28389093ed15eca990d39c51c5736cc +refs/heads/master: 96cc637235892a102fb829218adac048bd730ab7 diff --git a/trunk/drivers/net/ixgbe/ixgbe_common.c b/trunk/drivers/net/ixgbe/ixgbe_common.c index d5ede2df3e42..ebbda7d15254 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_common.c +++ b/trunk/drivers/net/ixgbe/ixgbe_common.c @@ -1370,6 +1370,9 @@ s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw) hw_dbg(hw, " New MAC Addr =%pM\n", hw->mac.addr); hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0, IXGBE_RAH_AV); + + /* clear VMDq pool/queue selection for RAR 0 */ + hw->mac.ops.clear_vmdq(hw, 0, IXGBE_CLEAR_VMDQ_ALL); } hw->addr_ctrl.overflow_promisc = 0; diff --git a/trunk/drivers/net/ixgbe/ixgbe_sriov.c b/trunk/drivers/net/ixgbe/ixgbe_sriov.c index 47b15738b009..187b3a16ec1f 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_sriov.c +++ b/trunk/drivers/net/ixgbe/ixgbe_sriov.c @@ -110,12 +110,10 @@ static int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid, return adapter->hw.mac.ops.set_vfta(&adapter->hw, vid, vf, (bool)add); } - static void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf, bool aupe) { u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf)); vmolr |= (IXGBE_VMOLR_ROMPE | - IXGBE_VMOLR_ROPE | IXGBE_VMOLR_BAM); if (aupe) vmolr |= IXGBE_VMOLR_AUPE;