Message ID | 80769D7B14936844A23C0C43D9FBCF0F254E49A854@orsmsx501.amr.corp.intel.com |
---|---|
State | RFC, archived |
Delegated to: | David Miller |
Headers | show |
From: "Duyck, Alexander H" <alexander.h.duyck@intel.com> Date: Tue, 23 Mar 2010 11:32:19 -0700 > The patch below should address it. However I suspect it will get > mangled by our email system here so I don't believe it will apply. > I have also sent a copy of to Jeff to pull into his tree for testing > and submission. Good spotting, thanks Alex. I'll wait for testing and a final version via Jeff. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 45a0e4f..7855f71 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -5110,7 +5110,7 @@ static void igb_receive_skb(struct igb_q_vector *q_vector, { struct igb_adapter *adapter = q_vector->adapter; - if (vlan_tag) + if (vlan_tag && adapter->vlgrp) vlan_gro_receive(&q_vector->napi, adapter->vlgrp, vlan_tag, skb); else--