aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Fastabend <john.r.fastabend@intel.com>2012-04-15 02:44:25 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-15 13:06:05 -0400
commit9dcb373c55c422f6c827b1a63c1be9b318a37151 (patch)
tree4867dc3c22a47e4e7e03a50af768da36f9bfafcd
parent0f4b0add851a741e9859b97558594fbfe6e19a2b (diff)
ixgbe: allow RAR table to be updated in promisc mode
This allows RAR table updates while in promiscuous. With SR-IOV enabled it is valuable to allow the RAR table to be updated even when in promisc mode to configure forwarding Signed-off-by: John Fastabend <john.r.fastabend@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 8b373951f644..25a7ed917a30 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -3462,16 +3462,17 @@ void ixgbe_set_rx_mode(struct net_device *netdev)
3462 } 3462 }
3463 ixgbe_vlan_filter_enable(adapter); 3463 ixgbe_vlan_filter_enable(adapter);
3464 hw->addr_ctrl.user_set_promisc = false; 3464 hw->addr_ctrl.user_set_promisc = false;
3465 /* 3465 }
3466 * Write addresses to available RAR registers, if there is not 3466
3467 * sufficient space to store all the addresses then enable 3467 /*
3468 * unicast promiscuous mode 3468 * Write addresses to available RAR registers, if there is not
3469 */ 3469 * sufficient space to store all the addresses then enable
3470 count = ixgbe_write_uc_addr_list(netdev); 3470 * unicast promiscuous mode
3471 if (count < 0) { 3471 */
3472 fctrl |= IXGBE_FCTRL_UPE; 3472 count = ixgbe_write_uc_addr_list(netdev);
3473 vmolr |= IXGBE_VMOLR_ROPE; 3473 if (count < 0) {
3474 } 3474 fctrl |= IXGBE_FCTRL_UPE;
3475 vmolr |= IXGBE_VMOLR_ROPE;
3475 } 3476 }
3476 3477
3477 if (adapter->num_vfs) { 3478 if (adapter->num_vfs) {