From f90fe6ba9f0128f5306f3929cb4e0b0f06d41448 Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Wed, 20 Jul 2011 04:54:09 +0000
Subject: [PATCH] --- yaml --- r: 256553 b: refs/heads/master c:
 0f7257281dcbc9bcb46b882c23fa57b6738fce5e h: refs/heads/master i:   256551:
 1a74b084ddfe697d5f3d6fbfd68d623242645f9a v: v3

---
 [refs]                         |  2 +-
 trunk/include/linux/inet_lro.h |  7 -------
 trunk/net/ipv4/inet_lro.c      | 20 --------------------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 8209820a69f9..983753af5d83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7756a96e1925addedc87db21ca6646e03b3c674f
+refs/heads/master: 0f7257281dcbc9bcb46b882c23fa57b6738fce5e
diff --git a/trunk/include/linux/inet_lro.h b/trunk/include/linux/inet_lro.h
index 940bbde05a52..b27e773e7144 100644
--- a/trunk/include/linux/inet_lro.h
+++ b/trunk/include/linux/inet_lro.h
@@ -155,13 +155,6 @@ void lro_receive_frags(struct net_lro_mgr *lro_mgr,
 		       struct skb_frag_struct *frags,
 		       int len, int true_size, void *priv, __wsum sum);
 
-void lro_vlan_hwaccel_receive_frags(struct net_lro_mgr *lro_mgr,
-				    struct skb_frag_struct *frags,
-				    int len, int true_size,
-				    struct vlan_group *vgrp,
-				    u16 vlan_tag,
-				    void *priv, __wsum sum);
-
 /*
  * Forward all aggregated SKBs held by lro_mgr to network stack
  */
diff --git a/trunk/net/ipv4/inet_lro.c b/trunk/net/ipv4/inet_lro.c
index e54425d47467..5cf07593282b 100644
--- a/trunk/net/ipv4/inet_lro.c
+++ b/trunk/net/ipv4/inet_lro.c
@@ -541,26 +541,6 @@ void lro_receive_frags(struct net_lro_mgr *lro_mgr,
 }
 EXPORT_SYMBOL(lro_receive_frags);
 
-void lro_vlan_hwaccel_receive_frags(struct net_lro_mgr *lro_mgr,
-				    struct skb_frag_struct *frags,
-				    int len, int true_size,
-				    struct vlan_group *vgrp,
-				    u16 vlan_tag, void *priv, __wsum sum)
-{
-	struct sk_buff *skb;
-
-	skb = __lro_proc_segment(lro_mgr, frags, len, true_size, vgrp,
-				 vlan_tag, priv, sum);
-	if (!skb)
-		return;
-
-	if (lro_mgr->features & LRO_F_NAPI)
-		vlan_hwaccel_receive_skb(skb, vgrp, vlan_tag);
-	else
-		vlan_hwaccel_rx(skb, vgrp, vlan_tag);
-}
-EXPORT_SYMBOL(lro_vlan_hwaccel_receive_frags);
-
 void lro_flush_all(struct net_lro_mgr *lro_mgr)
 {
 	int i;