1 files changed, 0 insertions, 35 deletions

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 118956448cf6..1dcfec8b49f3 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -37,39 +37,6 @@
 #include <linux/netpoll.h>
 
 /*
- *      Rebuild the Ethernet MAC header. This is called after an ARP
- *      (or in future other address resolution) has completed on this
- *      sk_buff. We now let ARP fill in the other fields.
- *
- *      This routine CANNOT use cached dst->neigh!
- *      Really, it is used only when dst->neigh is wrong.
- *
- * TODO:  This needs a checkup, I'm ignorant here. --BLG
- */
-static int vlan_dev_rebuild_header(struct sk_buff *skb)
-{
-        struct net_device *dev = skb->dev;
-        struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data);
-
-        switch (veth->h_vlan_encapsulated_proto) {
-#ifdef CONFIG_INET
-        case htons(ETH_P_IP):
-
-                /* TODO:  Confirm this will work with VLAN headers... */
-                return arp_find(veth->h_dest, skb);
-#endif
-        default:
-                pr_debug("%s: unable to resolve type %X addresses\n",
-                         dev->name, ntohs(veth->h_vlan_encapsulated_proto));
-
-                ether_addr_copy(veth->h_source, dev->dev_addr);
-                break;
-        }
-
-        return 0;
-}
-
-/*
  *      Create the VLAN header for an arbitrary protocol layer
  *
  *      saddr=NULL      means use device source address
@@ -534,7 +501,6 @@ static int vlan_dev_get_lock_subclass(struct net_device *dev)
 
 static const struct header_ops vlan_header_ops = {
         .create  = vlan_dev_hard_header,
-        .rebuild = vlan_dev_rebuild_header,
         .parse   = eth_header_parse,
 };
 
@@ -554,7 +520,6 @@ static int vlan_passthru_hard_header(struct sk_buff *skb, struct net_device *dev
 
 static const struct header_ops vlan_passthru_header_ops = {
         .create  = vlan_passthru_hard_header,
-        .rebuild = dev_rebuild_header,
         .parse   = eth_header_parse,
 };