net: vlan: make non-hw-accel rx path similar to hw-accel

[deliverable/linux.git] / net / 8021q / vlan.c

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index e47600b4e2e360d0ed59b0d1e1866bcdbd3da5cc..14ef5efbc653675ca7b3c23161fbe39f689c669f 100644 (file)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -49,11 +49,6 @@ const char vlan_version[] = DRV_VERSION;
 static const char vlan_copyright[] = "Ben Greear <greearb@candelatech.com>";
 static const char vlan_buggyright[] = "David S. Miller <davem@redhat.com>";
 
-static struct packet_type vlan_packet_type __read_mostly = {
-       .type = cpu_to_be16(ETH_P_8021Q),
-       .func = vlan_skb_recv, /* VLAN receive method */
-};
-
 /* End of global variables definitions. */
 
 static void vlan_group_free(struct vlan_group *grp)
@@ -684,7 +679,6 @@ static int __init vlan_proto_init(void)
        if (err < 0)
                goto err4;
 
-       dev_add_pack(&vlan_packet_type);
        vlan_ioctl_set(vlan_ioctl_handler);
        return 0;
 
@@ -705,8 +699,6 @@ static void __exit vlan_cleanup_module(void)
 
        unregister_netdevice_notifier(&vlan_notifier_block);
 
-       dev_remove_pack(&vlan_packet_type);
-
        unregister_pernet_subsys(&vlan_net_ops);
        rcu_barrier(); /* Wait for completion of call_rcu()'s */