---

yaml --- r: 256571 b: refs/heads/master c: 6dacadd h: refs/heads/master i: 256569: 0a4b816 256567: 07240e0 v: v3
git-mirror · Jul 21, 2011 · a4e8ee0 · a4e8ee0
1 parent eb05d6e
commit a4e8ee0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 312cd51353a4f5940eea963570b8b14b7d9290c4
+refs/heads/master: 6dacaddd4850cbd6390d4f87548262b5ed79b4a5
diff --git a/trunk/include/linux/if_vlan.h b/trunk/include/linux/if_vlan.h
@@ -202,19 +202,6 @@ static inline int vlan_hwaccel_rx(struct sk_buff *skb,
 	return __vlan_hwaccel_rx(skb, grp, vlan_tci, 0);
 }
 
-/**
- * vlan_hwaccel_receive_skb - netif_receive_skb wrapper for VLAN RX acceleration
- * @skb: buffer
- * @grp: vlan group
- * @vlan_tci: VLAN TCI as received from the card
- */
-static inline int vlan_hwaccel_receive_skb(struct sk_buff *skb,
-					   struct vlan_group *grp,
-					   u16 vlan_tci)
-{
-	return __vlan_hwaccel_rx(skb, grp, vlan_tci, 1);
-}
-
 /**
  * vlan_insert_tag - regular VLAN tag inserting
  * @skb: skbuff to tag