From 48029d3729d60048d7328ad32449ec01959298a7 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Wed, 22 Sep 2010 17:56:20 +0000 Subject: [PATCH] --- yaml --- r: 214750 b: refs/heads/master c: d85b9004bc2047d79248b167cc151ff9a4b509c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 364ec5540c56..d229ee3577b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 768190fdc058cc7405330f7782782df084c25d61 +refs/heads/master: d85b9004bc2047d79248b167cc151ff9a4b509c3 diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c index c4d861b557ca..fd922e7db1d5 100644 --- a/trunk/drivers/net/igb/igb_main.c +++ b/trunk/drivers/net/igb/igb_main.c @@ -4659,12 +4659,13 @@ static int igb_set_vf_promisc(struct igb_adapter *adapter, u32 *msgbuf, u32 vf) u32 vmolr = rd32(E1000_VMOLR(vf)); struct vf_data_storage *vf_data = &adapter->vf_data[vf]; - vf_data->flags |= ~(IGB_VF_FLAG_UNI_PROMISC | + vf_data->flags &= ~(IGB_VF_FLAG_UNI_PROMISC | IGB_VF_FLAG_MULTI_PROMISC); vmolr &= ~(E1000_VMOLR_ROPE | E1000_VMOLR_ROMPE | E1000_VMOLR_MPME); if (*msgbuf & E1000_VF_SET_PROMISC_MULTICAST) { vmolr |= E1000_VMOLR_MPME; + vf_data->flags |= IGB_VF_FLAG_MULTI_PROMISC; *msgbuf &= ~E1000_VF_SET_PROMISC_MULTICAST; } else { /*