---

yaml --- r: 189038 b: refs/heads/master c: 31b24b9 h: refs/heads/master v: v3
git-mirror · Mar 24, 2010 · 7ab97d8 · 7ab97d8
1 parent f96d447
commit 7ab97d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d07f3e375f608e52a1f8958fbde105bb27b7629a
+refs/heads/master: 31b24b955c3ebbb6f3008a6374e61cf7c05a193c
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
@@ -5102,7 +5102,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