From a4e8ee01bb813a47c1ac9035e33f64b8f3c27b37 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Wed, 20 Jul 2011 04:54:27 +0000 Subject: [PATCH] --- yaml --- r: 256571 b: refs/heads/master c: 6dacaddd4850cbd6390d4f87548262b5ed79b4a5 h: refs/heads/master i: 256569: 0a4b8161275b3339f2984983b577ed37bb950a38 256567: 07240e095d41aa2622aa0ba66f9b90baa990c13e v: v3 --- [refs] | 2 +- trunk/include/linux/if_vlan.h | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 7b8c86d65342..f7e69ba4878c 100644 --- 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 index 69391cc20f3d..3996713caaec 100644 --- 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