diff options
author | Tony Lindgren <tony@atomide.com> | 2011-02-25 21:27:14 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-02-25 21:27:14 +0100 |
commit | 02fa9f0451ac639a687bfc145eefe58703ff220e (patch) | |
tree | fe984acc78f22f6eb8fb98efaba8b1ac2f3ad8d9 /drivers/net/ixgbe/ixgbe_common.c | |
parent | OMAP2+: clocksource: fix crash on boot when !CONFIG_OMAP_32K_TIMER (diff) | |
parent | omap4: prcm: Fix the CPUx clockdomain offsets (diff) | |
download | linux-02fa9f0451ac639a687bfc145eefe58703ff220e.tar.xz linux-02fa9f0451ac639a687bfc145eefe58703ff220e.zip |
Merge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into devel-fixes
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_common.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c index d5ede2df3e42..ebbda7d15254 100644 --- a/drivers/net/ixgbe/ixgbe_common.c +++ b/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; |