net: Potential null skb->dev dereference
[linux-2.6.git] / net / 8021q / vlan_dev.c
index b6e0eea..9e83272 100644 (file)
@@ -3,7 +3,7 @@
  *             Ethernet-type device handling.
  *
  * Authors:    Ben Greear <greearb@candelatech.com>
- *              Please send support related email to: vlan@scry.wanfear.com
+ *              Please send support related email to: netdev@vger.kernel.org
  *              VLAN Home Page: http://www.candelatech.com/~greear/vlan.html
  *
  * Fixes:       Mar 22 2001: Martin Bokaemper <mbokaemper@unispherenetworks.com>
  */
 
 #include <linux/module.h>
-#include <linux/mm.h>
-#include <linux/in.h>
-#include <linux/init.h>
-#include <asm/uaccess.h> /* for copy_from_user */
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <net/datalink.h>
-#include <net/p8022.h>
+#include <linux/ethtool.h>
 #include <net/arp.h>
 
 #include "vlan.h"
 #include "vlanproc.h"
 #include <linux/if_vlan.h>
-#include <net/ip.h>
 
 /*
  *     Rebuild the Ethernet MAC header. This is called after an ARP
  *
  * TODO:  This needs a checkup, I'm ignorant here. --BLG
  */
-int vlan_dev_rebuild_header(struct sk_buff *skb)
+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 __constant_htons(ETH_P_IP):
+       case htons(ETH_P_IP):
 
                /* TODO:  Confirm this will work with VLAN headers... */
                return arp_find(veth->h_dest, skb);
 #endif
        default:
-               printk(VLAN_DBG
-                      "%s: unable to resolve type %X addresses.\n",
-                      dev->name, ntohs(veth->h_vlan_encapsulated_proto));
+               pr_debug("%s: unable to resolve type %X addresses.\n",
+                        dev->name, ntohs(veth->h_vlan_encapsulated_proto));
 
                memcpy(veth->h_source, dev->dev_addr, ETH_ALEN);
                break;
-       };
+       }
 
        return 0;
 }
 
 static inline struct sk_buff *vlan_check_reorder_header(struct sk_buff *skb)
 {
-       if (VLAN_DEV_INFO(skb->dev)->flags & 1) {
-               if (skb_shared(skb) || skb_cloned(skb)) {
-                       struct sk_buff *nskb = skb_copy(skb, GFP_ATOMIC);
-                       kfree_skb(skb);
-                       skb = nskb;
-               }
+       if (vlan_dev_info(skb->dev)->flags & VLAN_FLAG_REORDER_HDR) {
+               if (skb_cow(skb, skb_headroom(skb)) < 0)
+                       skb = NULL;
                if (skb) {
                        /* Lifted from Gleb's VLAN code... */
                        memmove(skb->data - ETH_HLEN,
                                skb->data - VLAN_ETH_HLEN, 12);
-                       skb->mac.raw += VLAN_HLEN;
+                       skb->mac_header += VLAN_HLEN;
                }
        }
 
        return skb;
 }
 
+static inline void vlan_set_encap_proto(struct sk_buff *skb,
+               struct vlan_hdr *vhdr)
+{
+       __be16 proto;
+       unsigned char *rawp;
+
+       /*
+        * Was a VLAN packet, grab the encapsulated protocol, which the layer
+        * three protocols care about.
+        */
+
+       proto = vhdr->h_vlan_encapsulated_proto;
+       if (ntohs(proto) >= 1536) {
+               skb->protocol = proto;
+               return;
+       }
+
+       rawp = skb->data;
+       if (*(unsigned short *)rawp == 0xFFFF)
+               /*
+                * This is a magic hack to spot IPX packets. Older Novell
+                * breaks the protocol design and runs IPX over 802.3 without
+                * an 802.2 LLC layer. We look for FFFF which isn't a used
+                * 802.2 SSAP/DSAP. This won't work for fault tolerant netware
+                * but does for the rest.
+                */
+               skb->protocol = htons(ETH_P_802_3);
+       else
+               /*
+                * Real 802.2 LLC
+                */
+               skb->protocol = htons(ETH_P_802_2);
+}
+
 /*
  *     Determine the packet's protocol ID. The rule here is that we
  *     assume 802.3 if the type field is short enough to be a length.
@@ -107,211 +131,102 @@ static inline struct sk_buff *vlan_check_reorder_header(struct sk_buff *skb)
  *  SANITY NOTE 2: We are referencing to the VLAN_HDR frields, which MAY be
  *                 stored UNALIGNED in the memory.  RISC systems don't like
  *                 such cases very much...
- *  SANITY NOTE 2a:  According to Dave Miller & Alexey, it will always be aligned,
- *                 so there doesn't need to be any of the unaligned stuff.  It has
- *                 been commented out now...  --Ben
+ *  SANITY NOTE 2a: According to Dave Miller & Alexey, it will always be
+ *                 aligned, so there doesn't need to be any of the unaligned
+ *                 stuff.  It has been commented out now...  --Ben
  *
  */
 int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
-                 struct packet_type* ptype, struct net_device *orig_dev)
+                 struct packet_type *ptype, struct net_device *orig_dev)
 {
-       unsigned char *rawp = NULL;
-       struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb->data);
-       unsigned short vid;
-       struct net_device_stats *stats;
-       unsigned short vlan_TCI;
-       __be16 proto;
-
-       /* vlan_TCI = ntohs(get_unaligned(&vhdr->h_vlan_TCI)); */
-       vlan_TCI = ntohs(vhdr->h_vlan_TCI);
-
-       vid = (vlan_TCI & VLAN_VID_MASK);
+       struct vlan_hdr *vhdr;
+       struct vlan_rx_stats *rx_stats;
+       u16 vlan_id;
+       u16 vlan_tci;
 
-#ifdef VLAN_DEBUG
-       printk(VLAN_DBG "%s: skb: %p vlan_id: %hx\n",
-               __FUNCTION__, skb, vid);
-#endif
+       skb = skb_share_check(skb, GFP_ATOMIC);
+       if (skb == NULL)
+               goto err_free;
 
-       /* Ok, we will find the correct VLAN device, strip the header,
-        * and then go on as usual.
-        */
+       if (unlikely(!pskb_may_pull(skb, VLAN_HLEN)))
+               goto err_free;
 
-       /* We have 12 bits of vlan ID.
-        *
-        * We must not drop allow preempt until we hold a
-        * reference to the device (netif_rx does that) or we
-        * fail.
-        */
+       vhdr = (struct vlan_hdr *)skb->data;
+       vlan_tci = ntohs(vhdr->h_vlan_TCI);
+       vlan_id = vlan_tci & VLAN_VID_MASK;
 
        rcu_read_lock();
-       skb->dev = __find_vlan_dev(dev, vid);
+       skb->dev = __find_vlan_dev(dev, vlan_id);
        if (!skb->dev) {
-               rcu_read_unlock();
-
-#ifdef VLAN_DEBUG
-               printk(VLAN_DBG "%s: ERROR: No net_device for VID: %i on dev: %s [%i]\n",
-                       __FUNCTION__, (unsigned int)(vid), dev->name, dev->ifindex);
-#endif
-               kfree_skb(skb);
-               return -1;
+               pr_debug("%s: ERROR: No net_device for VID: %u on dev: %s\n",
+                        __func__, vlan_id, dev->name);
+               goto err_unlock;
        }
 
-       skb->dev->last_rx = jiffies;
-
-       /* Bump the rx counters for the VLAN device. */
-       stats = vlan_dev_get_stats(skb->dev);
-       stats->rx_packets++;
-       stats->rx_bytes += skb->len;
+       rx_stats = per_cpu_ptr(vlan_dev_info(skb->dev)->vlan_rx_stats,
+                              smp_processor_id());
+       rx_stats->rx_packets++;
+       rx_stats->rx_bytes += skb->len;
 
-       /* Take off the VLAN header (4 bytes currently) */
        skb_pull_rcsum(skb, VLAN_HLEN);
 
-       /* Ok, lets check to make sure the device (dev) we
-        * came in on is what this VLAN is attached to.
-        */
+       skb->priority = vlan_get_ingress_priority(skb->dev, vlan_tci);
 
-       if (dev != VLAN_DEV_INFO(skb->dev)->real_dev) {
-               rcu_read_unlock();
+       pr_debug("%s: priority: %u for TCI: %hu\n",
+                __func__, skb->priority, vlan_tci);
 
-#ifdef VLAN_DEBUG
-               printk(VLAN_DBG "%s: dropping skb: %p because came in on wrong device, dev: %s  real_dev: %s, skb_dev: %s\n",
-                       __FUNCTION__, skb, dev->name,
-                       VLAN_DEV_INFO(skb->dev)->real_dev->name,
-                       skb->dev->name);
-#endif
-               kfree_skb(skb);
-               stats->rx_errors++;
-               return -1;
-       }
-
-       /*
-        * Deal with ingress priority mapping.
-        */
-       skb->priority = vlan_get_ingress_priority(skb->dev, ntohs(vhdr->h_vlan_TCI));
-
-#ifdef VLAN_DEBUG
-       printk(VLAN_DBG "%s: priority: %lu  for TCI: %hu (hbo)\n",
-               __FUNCTION__, (unsigned long)(skb->priority),
-               ntohs(vhdr->h_vlan_TCI));
-#endif
-
-       /* The ethernet driver already did the pkt_type calculations
-        * for us...
-        */
        switch (skb->pkt_type) {
        case PACKET_BROADCAST: /* Yeah, stats collect these together.. */
-               // stats->broadcast ++; // no such counter :-(
+               /* stats->broadcast ++; // no such counter :-( */
                break;
 
        case PACKET_MULTICAST:
-               stats->multicast++;
+               rx_stats->multicast++;
                break;
 
        case PACKET_OTHERHOST:
                /* Our lower layer thinks this is not local, let's make sure.
-                * This allows the VLAN to have a different MAC than the underlying
-                * device, and still route correctly.
+                * This allows the VLAN to have a different MAC than the
+                * underlying device, and still route correctly.
                 */
-               if (!compare_ether_addr(eth_hdr(skb)->h_dest, skb->dev->dev_addr)) {
-                       /* It is for our (changed) MAC-address! */
+               if (!compare_ether_addr(eth_hdr(skb)->h_dest,
+                                       skb->dev->dev_addr))
                        skb->pkt_type = PACKET_HOST;
-               }
                break;
        default:
                break;
-       };
-
-       /*  Was a VLAN packet, grab the encapsulated protocol, which the layer
-        * three protocols care about.
-        */
-       /* proto = get_unaligned(&vhdr->h_vlan_encapsulated_proto); */
-       proto = vhdr->h_vlan_encapsulated_proto;
-
-       skb->protocol = proto;
-       if (ntohs(proto) >= 1536) {
-               /* place it back on the queue to be handled by
-                * true layer 3 protocols.
-                */
-
-               /* See if we are configured to re-write the VLAN header
-                * to make it look like ethernet...
-                */
-               skb = vlan_check_reorder_header(skb);
-
-               /* Can be null if skb-clone fails when re-ordering */
-               if (skb) {
-                       netif_rx(skb);
-               } else {
-                       /* TODO:  Add a more specific counter here. */
-                       stats->rx_errors++;
-               }
-               rcu_read_unlock();
-               return 0;
        }
 
-       rawp = skb->data;
-
-       /*
-        * This is a magic hack to spot IPX packets. Older Novell breaks
-        * the protocol design and runs IPX over 802.3 without an 802.2 LLC
-        * layer. We look for FFFF which isn't a used 802.2 SSAP/DSAP. This
-        * won't work for fault tolerant netware but does for the rest.
-        */
-       if (*(unsigned short *)rawp == 0xFFFF) {
-               skb->protocol = __constant_htons(ETH_P_802_3);
-               /* place it back on the queue to be handled by true layer 3 protocols.
-                */
-
-               /* See if we are configured to re-write the VLAN header
-                * to make it look like ethernet...
-                */
-               skb = vlan_check_reorder_header(skb);
+       vlan_set_encap_proto(skb, vhdr);
 
-               /* Can be null if skb-clone fails when re-ordering */
-               if (skb) {
-                       netif_rx(skb);
-               } else {
-                       /* TODO:  Add a more specific counter here. */
-                       stats->rx_errors++;
-               }
-               rcu_read_unlock();
-               return 0;
+       skb = vlan_check_reorder_header(skb);
+       if (!skb) {
+               rx_stats->rx_errors++;
+               goto err_unlock;
        }
 
-       /*
-        *      Real 802.2 LLC
-        */
-       skb->protocol = __constant_htons(ETH_P_802_2);
-       /* place it back on the queue to be handled by upper layer protocols.
-        */
-
-       /* See if we are configured to re-write the VLAN header
-        * to make it look like ethernet...
-        */
-       skb = vlan_check_reorder_header(skb);
+       netif_rx(skb);
+       rcu_read_unlock();
+       return NET_RX_SUCCESS;
 
-       /* Can be null if skb-clone fails when re-ordering */
-       if (skb) {
-               netif_rx(skb);
-       } else {
-               /* TODO:  Add a more specific counter here. */
-               stats->rx_errors++;
-       }
+err_unlock:
        rcu_read_unlock();
-       return 0;
+err_free:
+       kfree_skb(skb);
+       return NET_RX_DROP;
 }
 
-static inline unsigned short vlan_dev_get_egress_qos_mask(struct net_device* dev,
-                                                         struct sk_buff* skb)
+static inline u16
+vlan_dev_get_egress_qos_mask(struct net_device *dev, struct sk_buff *skb)
 {
-       struct vlan_priority_tci_mapping *mp =
-               VLAN_DEV_INFO(dev)->egress_priority_map[(skb->priority & 0xF)];
+       struct vlan_priority_tci_mapping *mp;
 
+       mp = vlan_dev_info(dev)->egress_priority_map[(skb->priority & 0xF)];
        while (mp) {
                if (mp->priority == skb->priority) {
-                       return mp->vlan_qos; /* This should already be shifted to mask
-                                             * correctly with the VLAN's TCI
-                                             */
+                       return mp->vlan_qos; /* This should already be shifted
+                                             * to mask correctly with the
+                                             * VLAN's TCI */
                }
                mp = mp->next;
        }
@@ -327,206 +242,131 @@ static inline unsigned short vlan_dev_get_egress_qos_mask(struct net_device* dev
  *  This is called when the SKB is moving down the stack towards the
  *  physical devices.
  */
-int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
-                        unsigned short type, void *daddr, void *saddr,
-                        unsigned len)
+static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
+                               unsigned short type,
+                               const void *daddr, const void *saddr,
+                               unsigned int len)
 {
        struct vlan_hdr *vhdr;
-       unsigned short veth_TCI = 0;
-       int rc = 0;
-       int build_vlan_header = 0;
-       struct net_device *vdev = dev; /* save this for the bottom of the method */
-
-#ifdef VLAN_DEBUG
-       printk(VLAN_DBG "%s: skb: %p type: %hx len: %x vlan_id: %hx, daddr: %p\n",
-               __FUNCTION__, skb, type, len, VLAN_DEV_INFO(dev)->vlan_id, daddr);
-#endif
+       unsigned int vhdrlen = 0;
+       u16 vlan_tci = 0;
+       int rc;
 
-       /* build vlan header only if re_order_header flag is NOT set.  This
-        * fixes some programs that get confused when they see a VLAN device
-        * sending a frame that is VLAN encoded (the consensus is that the VLAN
-        * device should look completely like an Ethernet device when the
-        * REORDER_HEADER flag is set)  The drawback to this is some extra
-        * header shuffling in the hard_start_xmit.  Users can turn off this
-        * REORDER behaviour with the vconfig tool.
-        */
-       build_vlan_header = ((VLAN_DEV_INFO(dev)->flags & 1) == 0);
+       if (WARN_ON(skb_headroom(skb) < dev->hard_header_len))
+               return -ENOSPC;
 
-       if (build_vlan_header) {
+       if (!(vlan_dev_info(dev)->flags & VLAN_FLAG_REORDER_HDR)) {
                vhdr = (struct vlan_hdr *) skb_push(skb, VLAN_HLEN);
 
-               /* build the four bytes that make this a VLAN header. */
-
-               /* Now, construct the second two bytes. This field looks something
-                * like:
-                * usr_priority: 3 bits  (high bits)
-                * CFI           1 bit
-                * VLAN ID       12 bits (low bits)
-                *
-                */
-               veth_TCI = VLAN_DEV_INFO(dev)->vlan_id;
-               veth_TCI |= vlan_dev_get_egress_qos_mask(dev, skb);
-
-               vhdr->h_vlan_TCI = htons(veth_TCI);
+               vlan_tci = vlan_dev_info(dev)->vlan_id;
+               vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb);
+               vhdr->h_vlan_TCI = htons(vlan_tci);
 
                /*
-                *  Set the protocol type.
-                *  For a packet of type ETH_P_802_3 we put the length in here instead.
-                *  It is up to the 802.2 layer to carry protocol information.
+                *  Set the protocol type. For a packet of type ETH_P_802_3/2 we
+                *  put the length in here instead.
                 */
-
-               if (type != ETH_P_802_3) {
+               if (type != ETH_P_802_3 && type != ETH_P_802_2)
                        vhdr->h_vlan_encapsulated_proto = htons(type);
-               } else {
+               else
                        vhdr->h_vlan_encapsulated_proto = htons(len);
-               }
 
                skb->protocol = htons(ETH_P_8021Q);
-               skb->nh.raw = skb->data;
+               type = ETH_P_8021Q;
+               vhdrlen = VLAN_HLEN;
        }
 
        /* Before delegating work to the lower layer, enter our MAC-address */
        if (saddr == NULL)
                saddr = dev->dev_addr;
 
-       dev = VLAN_DEV_INFO(dev)->real_dev;
-
-       /* MPLS can send us skbuffs w/out enough space.  This check will grow the
-        * skb if it doesn't have enough headroom.  Not a beautiful solution, so
-        * I'll tick a counter so that users can know it's happening...  If they
-        * care...
-        */
-
-       /* NOTE:  This may still break if the underlying device is not the final
-        * device (and thus there are more headers to add...)  It should work for
-        * good-ole-ethernet though.
-        */
-       if (skb_headroom(skb) < dev->hard_header_len) {
-               struct sk_buff *sk_tmp = skb;
-               skb = skb_realloc_headroom(sk_tmp, dev->hard_header_len);
-               kfree_skb(sk_tmp);
-               if (skb == NULL) {
-                       struct net_device_stats *stats = vlan_dev_get_stats(vdev);
-                       stats->tx_dropped++;
-                       return -ENOMEM;
-               }
-               VLAN_DEV_INFO(vdev)->cnt_inc_headroom_on_tx++;
-#ifdef VLAN_DEBUG
-               printk(VLAN_DBG "%s: %s: had to grow skb.\n", __FUNCTION__, vdev->name);
-#endif
-       }
-
-       if (build_vlan_header) {
-               /* Now make the underlying real hard header */
-               rc = dev->hard_header(skb, dev, ETH_P_8021Q, daddr, saddr, len + VLAN_HLEN);
-
-               if (rc > 0) {
-                       rc += VLAN_HLEN;
-               } else if (rc < 0) {
-                       rc -= VLAN_HLEN;
-               }
-       } else {
-               /* If here, then we'll just make a normal looking ethernet frame,
-                * but, the hard_start_xmit method will insert the tag (it has to
-                * be able to do this for bridged and other skbs that don't come
-                * down the protocol stack in an orderly manner.
-                */
-               rc = dev->hard_header(skb, dev, type, daddr, saddr, len);
-       }
-
+       /* Now make the underlying real hard header */
+       dev = vlan_dev_info(dev)->real_dev;
+       rc = dev_hard_header(skb, dev, type, daddr, saddr, len + vhdrlen);
+       if (rc > 0)
+               rc += vhdrlen;
        return rc;
 }
 
-int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,
+                                           struct net_device *dev)
 {
-       struct net_device_stats *stats = vlan_dev_get_stats(dev);
+       int i = skb_get_queue_mapping(skb);
+       struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
        struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data);
+       unsigned int len;
+       int ret;
 
        /* Handle non-VLAN frames if they are sent to us, for example by DHCP.
         *
         * NOTE: THIS ASSUMES DIX ETHERNET, SPECIFICALLY NOT SUPPORTING
         * OTHER THINGS LIKE FDDI/TokenRing/802.3 SNAPs...
         */
+       if (veth->h_vlan_proto != htons(ETH_P_8021Q) ||
+           vlan_dev_info(dev)->flags & VLAN_FLAG_REORDER_HDR) {
+               unsigned int orig_headroom = skb_headroom(skb);
+               u16 vlan_tci;
 
-       if (veth->h_vlan_proto != __constant_htons(ETH_P_8021Q)) {
-               int orig_headroom = skb_headroom(skb);
-               unsigned short veth_TCI;
+               vlan_dev_info(dev)->cnt_encap_on_xmit++;
 
-               /* This is not a VLAN frame...but we can fix that! */
-               VLAN_DEV_INFO(dev)->cnt_encap_on_xmit++;
-
-#ifdef VLAN_DEBUG
-               printk(VLAN_DBG "%s: proto to encap: 0x%hx (hbo)\n",
-                       __FUNCTION__, htons(veth->h_vlan_proto));
-#endif
-               /* Construct the second two bytes. This field looks something
-                * like:
-                * usr_priority: 3 bits  (high bits)
-                * CFI           1 bit
-                * VLAN ID       12 bits (low bits)
-                */
-               veth_TCI = VLAN_DEV_INFO(dev)->vlan_id;
-               veth_TCI |= vlan_dev_get_egress_qos_mask(dev, skb);
-
-               skb = __vlan_put_tag(skb, veth_TCI);
+               vlan_tci = vlan_dev_info(dev)->vlan_id;
+               vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb);
+               skb = __vlan_put_tag(skb, vlan_tci);
                if (!skb) {
-                       stats->tx_dropped++;
-                       return 0;
+                       txq->tx_dropped++;
+                       return NETDEV_TX_OK;
                }
 
-               if (orig_headroom < VLAN_HLEN) {
-                       VLAN_DEV_INFO(dev)->cnt_inc_headroom_on_tx++;
-               }
+               if (orig_headroom < VLAN_HLEN)
+                       vlan_dev_info(dev)->cnt_inc_headroom_on_tx++;
        }
 
-#ifdef VLAN_DEBUG
-       printk(VLAN_DBG "%s: about to send skb: %p to dev: %s\n",
-               __FUNCTION__, skb, skb->dev->name);
-       printk(VLAN_DBG "  %2hx.%2hx.%2hx.%2xh.%2hx.%2hx %2hx.%2hx.%2hx.%2hx.%2hx.%2hx %4hx %4hx %4hx\n",
-              veth->h_dest[0], veth->h_dest[1], veth->h_dest[2], veth->h_dest[3], veth->h_dest[4], veth->h_dest[5],
-              veth->h_source[0], veth->h_source[1], veth->h_source[2], veth->h_source[3], veth->h_source[4], veth->h_source[5],
-              veth->h_vlan_proto, veth->h_vlan_TCI, veth->h_vlan_encapsulated_proto);
-#endif
 
-       stats->tx_packets++; /* for statics only */
-       stats->tx_bytes += skb->len;
+       skb_set_dev(skb, vlan_dev_info(dev)->real_dev);
+       len = skb->len;
+       ret = dev_queue_xmit(skb);
 
-       skb->dev = VLAN_DEV_INFO(dev)->real_dev;
-       dev_queue_xmit(skb);
+       if (likely(ret == NET_XMIT_SUCCESS)) {
+               txq->tx_packets++;
+               txq->tx_bytes += len;
+       } else
+               txq->tx_dropped++;
 
-       return 0;
+       return ret;
 }
 
-int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,
+                                                   struct net_device *dev)
 {
-       struct net_device_stats *stats = vlan_dev_get_stats(dev);
-       unsigned short veth_TCI;
-
-       /* Construct the second two bytes. This field looks something
-        * like:
-        * usr_priority: 3 bits  (high bits)
-        * CFI           1 bit
-        * VLAN ID       12 bits (low bits)
-        */
-       veth_TCI = VLAN_DEV_INFO(dev)->vlan_id;
-       veth_TCI |= vlan_dev_get_egress_qos_mask(dev, skb);
-       skb = __vlan_hwaccel_put_tag(skb, veth_TCI);
-
-       stats->tx_packets++;
-       stats->tx_bytes += skb->len;
-
-       skb->dev = VLAN_DEV_INFO(dev)->real_dev;
-       dev_queue_xmit(skb);
-
-       return 0;
+       int i = skb_get_queue_mapping(skb);
+       struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
+       u16 vlan_tci;
+       unsigned int len;
+       int ret;
+
+       vlan_tci = vlan_dev_info(dev)->vlan_id;
+       vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb);
+       skb = __vlan_hwaccel_put_tag(skb, vlan_tci);
+
+       skb->dev = vlan_dev_info(dev)->real_dev;
+       len = skb->len;
+       ret = dev_queue_xmit(skb);
+
+       if (likely(ret == NET_XMIT_SUCCESS)) {
+               txq->tx_packets++;
+               txq->tx_bytes += len;
+       } else
+               txq->tx_dropped++;
+
+       return ret;
 }
 
-int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)
+static int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)
 {
        /* TODO: gotta make sure the underlying layer can handle it,
         * maybe an IFF_VLAN_CAPABLE flag for devices?
         */
-       if (VLAN_DEV_INFO(dev)->real_dev->mtu < new_mtu)
+       if (vlan_dev_info(dev)->real_dev->mtu < new_mtu)
                return -ERANGE;
 
        dev->mtu = new_mtu;
@@ -534,361 +374,508 @@ int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)
        return 0;
 }
 
-int vlan_dev_set_ingress_priority(char *dev_name, __u32 skb_prio, short vlan_prio)
+void vlan_dev_set_ingress_priority(const struct net_device *dev,
+                                  u32 skb_prio, u16 vlan_prio)
 {
-       struct net_device *dev = dev_get_by_name(dev_name);
+       struct vlan_dev_info *vlan = vlan_dev_info(dev);
 
-       if (dev) {
-               if (dev->priv_flags & IFF_802_1Q_VLAN) {
-                       /* see if a priority mapping exists.. */
-                       VLAN_DEV_INFO(dev)->ingress_priority_map[vlan_prio & 0x7] = skb_prio;
-                       dev_put(dev);
-                       return 0;
-               }
+       if (vlan->ingress_priority_map[vlan_prio & 0x7] && !skb_prio)
+               vlan->nr_ingress_mappings--;
+       else if (!vlan->ingress_priority_map[vlan_prio & 0x7] && skb_prio)
+               vlan->nr_ingress_mappings++;
 
-               dev_put(dev);
-       }
-       return -EINVAL;
+       vlan->ingress_priority_map[vlan_prio & 0x7] = skb_prio;
 }
 
-int vlan_dev_set_egress_priority(char *dev_name, __u32 skb_prio, short vlan_prio)
+int vlan_dev_set_egress_priority(const struct net_device *dev,
+                                u32 skb_prio, u16 vlan_prio)
 {
-       struct net_device *dev = dev_get_by_name(dev_name);
+       struct vlan_dev_info *vlan = vlan_dev_info(dev);
        struct vlan_priority_tci_mapping *mp = NULL;
        struct vlan_priority_tci_mapping *np;
+       u32 vlan_qos = (vlan_prio << VLAN_PRIO_SHIFT) & VLAN_PRIO_MASK;
 
-       if (dev) {
-               if (dev->priv_flags & IFF_802_1Q_VLAN) {
-                       /* See if a priority mapping exists.. */
-                       mp = VLAN_DEV_INFO(dev)->egress_priority_map[skb_prio & 0xF];
-                       while (mp) {
-                               if (mp->priority == skb_prio) {
-                                       mp->vlan_qos = ((vlan_prio << 13) & 0xE000);
-                                       dev_put(dev);
-                                       return 0;
-                               }
-                               mp = mp->next;
-                       }
-
-                       /* Create a new mapping then. */
-                       mp = VLAN_DEV_INFO(dev)->egress_priority_map[skb_prio & 0xF];
-                       np = kmalloc(sizeof(struct vlan_priority_tci_mapping), GFP_KERNEL);
-                       if (np) {
-                               np->next = mp;
-                               np->priority = skb_prio;
-                               np->vlan_qos = ((vlan_prio << 13) & 0xE000);
-                               VLAN_DEV_INFO(dev)->egress_priority_map[skb_prio & 0xF] = np;
-                               dev_put(dev);
-                               return 0;
-                       } else {
-                               dev_put(dev);
-                               return -ENOBUFS;
-                       }
-               }
-               dev_put(dev);
-       }
-       return -EINVAL;
-}
-
-/* Flags are defined in the vlan_dev_info class in include/linux/if_vlan.h file. */
-int vlan_dev_set_vlan_flag(char *dev_name, __u32 flag, short flag_val)
-{
-       struct net_device *dev = dev_get_by_name(dev_name);
-
-       if (dev) {
-               if (dev->priv_flags & IFF_802_1Q_VLAN) {
-                       /* verify flag is supported */
-                       if (flag == 1) {
-                               if (flag_val) {
-                                       VLAN_DEV_INFO(dev)->flags |= 1;
-                               } else {
-                                       VLAN_DEV_INFO(dev)->flags &= ~1;
-                               }
-                               dev_put(dev);
-                               return 0;
-                       } else {
-                               printk(KERN_ERR  "%s: flag %i is not valid.\n",
-                                       __FUNCTION__, (int)(flag));
-                               dev_put(dev);
-                               return -EINVAL;
-                       }
-               } else {
-                       printk(KERN_ERR
-                              "%s: %s is not a vlan device, priv_flags: %hX.\n",
-                              __FUNCTION__, dev->name, dev->priv_flags);
-                       dev_put(dev);
+       /* See if a priority mapping exists.. */
+       mp = vlan->egress_priority_map[skb_prio & 0xF];
+       while (mp) {
+               if (mp->priority == skb_prio) {
+                       if (mp->vlan_qos && !vlan_qos)
+                               vlan->nr_egress_mappings--;
+                       else if (!mp->vlan_qos && vlan_qos)
+                               vlan->nr_egress_mappings++;
+                       mp->vlan_qos = vlan_qos;
+                       return 0;
                }
-       } else {
-               printk(KERN_ERR  "%s: Could not find device: %s\n",
-                       __FUNCTION__, dev_name);
+               mp = mp->next;
        }
 
-       return -EINVAL;
+       /* Create a new mapping then. */
+       mp = vlan->egress_priority_map[skb_prio & 0xF];
+       np = kmalloc(sizeof(struct vlan_priority_tci_mapping), GFP_KERNEL);
+       if (!np)
+               return -ENOBUFS;
+
+       np->next = mp;
+       np->priority = skb_prio;
+       np->vlan_qos = vlan_qos;
+       vlan->egress_priority_map[skb_prio & 0xF] = np;
+       if (vlan_qos)
+               vlan->nr_egress_mappings++;
+       return 0;
 }
 
-
-int vlan_dev_get_realdev_name(const char *dev_name, char* result)
+/* Flags are defined in the vlan_flags enum in include/linux/if_vlan.h file. */
+int vlan_dev_change_flags(const struct net_device *dev, u32 flags, u32 mask)
 {
-       struct net_device *dev = dev_get_by_name(dev_name);
-       int rv = 0;
-       if (dev) {
-               if (dev->priv_flags & IFF_802_1Q_VLAN) {
-                       strncpy(result, VLAN_DEV_INFO(dev)->real_dev->name, 23);
-                       rv = 0;
-               } else {
-                       rv = -EINVAL;
-               }
-               dev_put(dev);
-       } else {
-               rv = -ENODEV;
+       struct vlan_dev_info *vlan = vlan_dev_info(dev);
+       u32 old_flags = vlan->flags;
+
+       if (mask & ~(VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP |
+                    VLAN_FLAG_LOOSE_BINDING))
+               return -EINVAL;
+
+       vlan->flags = (old_flags & ~mask) | (flags & mask);
+
+       if (netif_running(dev) && (vlan->flags ^ old_flags) & VLAN_FLAG_GVRP) {
+               if (vlan->flags & VLAN_FLAG_GVRP)
+                       vlan_gvrp_request_join(dev);
+               else
+                       vlan_gvrp_request_leave(dev);
        }
-       return rv;
+       return 0;
 }
 
-int vlan_dev_get_vid(const char *dev_name, unsigned short* result)
+void vlan_dev_get_realdev_name(const struct net_device *dev, char *result)
 {
-       struct net_device *dev = dev_get_by_name(dev_name);
-       int rv = 0;
-       if (dev) {
-               if (dev->priv_flags & IFF_802_1Q_VLAN) {
-                       *result = VLAN_DEV_INFO(dev)->vlan_id;
-                       rv = 0;
-               } else {
-                       rv = -EINVAL;
-               }
-               dev_put(dev);
-       } else {
-               rv = -ENODEV;
-       }
-       return rv;
+       strncpy(result, vlan_dev_info(dev)->real_dev->name, 23);
 }
 
+static int vlan_dev_open(struct net_device *dev)
+{
+       struct vlan_dev_info *vlan = vlan_dev_info(dev);
+       struct net_device *real_dev = vlan->real_dev;
+       int err;
+
+       if (!(real_dev->flags & IFF_UP) &&
+           !(vlan->flags & VLAN_FLAG_LOOSE_BINDING))
+               return -ENETDOWN;
+
+       if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) {
+               err = dev_unicast_add(real_dev, dev->dev_addr);
+               if (err < 0)
+                       goto out;
+       }
+
+       if (dev->flags & IFF_ALLMULTI) {
+               err = dev_set_allmulti(real_dev, 1);
+               if (err < 0)
+                       goto del_unicast;
+       }
+       if (dev->flags & IFF_PROMISC) {
+               err = dev_set_promiscuity(real_dev, 1);
+               if (err < 0)
+                       goto clear_allmulti;
+       }
+
+       memcpy(vlan->real_dev_addr, real_dev->dev_addr, ETH_ALEN);
+
+       if (vlan->flags & VLAN_FLAG_GVRP)
+               vlan_gvrp_request_join(dev);
+
+       netif_carrier_on(dev);
+       return 0;
+
+clear_allmulti:
+       if (dev->flags & IFF_ALLMULTI)
+               dev_set_allmulti(real_dev, -1);
+del_unicast:
+       if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr))
+               dev_unicast_delete(real_dev, dev->dev_addr);
+out:
+       netif_carrier_off(dev);
+       return err;
+}
 
-int vlan_dev_set_mac_address(struct net_device *dev, void *addr_struct_p)
+static int vlan_dev_stop(struct net_device *dev)
 {
-       struct sockaddr *addr = (struct sockaddr *)(addr_struct_p);
-       int i;
+       struct vlan_dev_info *vlan = vlan_dev_info(dev);
+       struct net_device *real_dev = vlan->real_dev;
+
+       if (vlan->flags & VLAN_FLAG_GVRP)
+               vlan_gvrp_request_leave(dev);
 
-       if (netif_running(dev))
-               return -EBUSY;
+       dev_mc_unsync(real_dev, dev);
+       dev_unicast_unsync(real_dev, dev);
+       if (dev->flags & IFF_ALLMULTI)
+               dev_set_allmulti(real_dev, -1);
+       if (dev->flags & IFF_PROMISC)
+               dev_set_promiscuity(real_dev, -1);
 
-       memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+       if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr))
+               dev_unicast_delete(real_dev, dev->dev_addr);
+
+       netif_carrier_off(dev);
+       return 0;
+}
 
-       printk("%s: Setting MAC address to ", dev->name);
-       for (i = 0; i < 6; i++)
-               printk(" %2.2x", dev->dev_addr[i]);
-       printk(".\n");
+static int vlan_dev_set_mac_address(struct net_device *dev, void *p)
+{
+       struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+       struct sockaddr *addr = p;
+       int err;
 
-       if (memcmp(VLAN_DEV_INFO(dev)->real_dev->dev_addr,
-                  dev->dev_addr,
-                  dev->addr_len) != 0) {
-               if (!(VLAN_DEV_INFO(dev)->real_dev->flags & IFF_PROMISC)) {
-                       int flgs = VLAN_DEV_INFO(dev)->real_dev->flags;
+       if (!is_valid_ether_addr(addr->sa_data))
+               return -EADDRNOTAVAIL;
 
-                       /* Increment our in-use promiscuity counter */
-                       dev_set_promiscuity(VLAN_DEV_INFO(dev)->real_dev, 1);
+       if (!(dev->flags & IFF_UP))
+               goto out;
 
-                       /* Make PROMISC visible to the user. */
-                       flgs |= IFF_PROMISC;
-                       printk("VLAN (%s):  Setting underlying device (%s) to promiscious mode.\n",
-                              dev->name, VLAN_DEV_INFO(dev)->real_dev->name);
-                       dev_change_flags(VLAN_DEV_INFO(dev)->real_dev, flgs);
-               }
-       } else {
-               printk("VLAN (%s):  Underlying device (%s) has same MAC, not checking promiscious mode.\n",
-                      dev->name, VLAN_DEV_INFO(dev)->real_dev->name);
+       if (compare_ether_addr(addr->sa_data, real_dev->dev_addr)) {
+               err = dev_unicast_add(real_dev, addr->sa_data);
+               if (err < 0)
+                       return err;
        }
 
+       if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr))
+               dev_unicast_delete(real_dev, dev->dev_addr);
+
+out:
+       memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
        return 0;
 }
 
-static inline int vlan_dmi_equals(struct dev_mc_list *dmi1,
-                                 struct dev_mc_list *dmi2)
+static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
-       return ((dmi1->dmi_addrlen == dmi2->dmi_addrlen) &&
-               (memcmp(dmi1->dmi_addr, dmi2->dmi_addr, dmi1->dmi_addrlen) == 0));
-}
+       struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+       const struct net_device_ops *ops = real_dev->netdev_ops;
+       struct ifreq ifrr;
+       int err = -EOPNOTSUPP;
 
-/** dmi is a single entry into a dev_mc_list, a single node.  mc_list is
- *  an entire list, and we'll iterate through it.
- */
-static int vlan_should_add_mc(struct dev_mc_list *dmi, struct dev_mc_list *mc_list)
-{
-       struct dev_mc_list *idmi;
-
-       for (idmi = mc_list; idmi != NULL; ) {
-               if (vlan_dmi_equals(dmi, idmi)) {
-                       if (dmi->dmi_users > idmi->dmi_users)
-                               return 1;
-                       else
-                               return 0;
-               } else {
-                       idmi = idmi->next;
-               }
+       strncpy(ifrr.ifr_name, real_dev->name, IFNAMSIZ);
+       ifrr.ifr_ifru = ifr->ifr_ifru;
+
+       switch (cmd) {
+       case SIOCGMIIPHY:
+       case SIOCGMIIREG:
+       case SIOCSMIIREG:
+               if (netif_device_present(real_dev) && ops->ndo_do_ioctl)
+                       err = ops->ndo_do_ioctl(real_dev, &ifrr, cmd);
+               break;
        }
 
-       return 1;
+       if (!err)
+               ifr->ifr_ifru = ifrr.ifr_ifru;
+
+       return err;
 }
 
-static inline void vlan_destroy_mc_list(struct dev_mc_list *mc_list)
+static int vlan_dev_neigh_setup(struct net_device *dev, struct neigh_parms *pa)
 {
-       struct dev_mc_list *dmi = mc_list;
-       struct dev_mc_list *next;
+       struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+       const struct net_device_ops *ops = real_dev->netdev_ops;
+       int err = 0;
 
-       while(dmi) {
-               next = dmi->next;
-               kfree(dmi);
-               dmi = next;
-       }
+       if (netif_device_present(real_dev) && ops->ndo_neigh_setup)
+               err = ops->ndo_neigh_setup(real_dev, pa);
+
+       return err;
 }
 
-static void vlan_copy_mc_list(struct dev_mc_list *mc_list, struct vlan_dev_info *vlan_info)
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+static int vlan_dev_fcoe_ddp_setup(struct net_device *dev, u16 xid,
+                                  struct scatterlist *sgl, unsigned int sgc)
 {
-       struct dev_mc_list *dmi, *new_dmi;
+       struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+       const struct net_device_ops *ops = real_dev->netdev_ops;
+       int rc = 0;
 
-       vlan_destroy_mc_list(vlan_info->old_mc_list);
-       vlan_info->old_mc_list = NULL;
+       if (ops->ndo_fcoe_ddp_setup)
+               rc = ops->ndo_fcoe_ddp_setup(real_dev, xid, sgl, sgc);
 
-       for (dmi = mc_list; dmi != NULL; dmi = dmi->next) {
-               new_dmi = kmalloc(sizeof(*new_dmi), GFP_ATOMIC);
-               if (new_dmi == NULL) {
-                       printk(KERN_ERR "vlan: cannot allocate memory. "
-                              "Multicast may not work properly from now.\n");
-                       return;
-               }
+       return rc;
+}
 
-               /* Copy whole structure, then make new 'next' pointer */
-               *new_dmi = *dmi;
-               new_dmi->next = vlan_info->old_mc_list;
-               vlan_info->old_mc_list = new_dmi;
-       }
+static int vlan_dev_fcoe_ddp_done(struct net_device *dev, u16 xid)
+{
+       struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+       const struct net_device_ops *ops = real_dev->netdev_ops;
+       int len = 0;
+
+       if (ops->ndo_fcoe_ddp_done)
+               len = ops->ndo_fcoe_ddp_done(real_dev, xid);
+
+       return len;
 }
 
-static void vlan_flush_mc_list(struct net_device *dev)
+static int vlan_dev_fcoe_enable(struct net_device *dev)
 {
-       struct dev_mc_list *dmi = dev->mc_list;
+       struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+       const struct net_device_ops *ops = real_dev->netdev_ops;
+       int rc = -EINVAL;
 
-       while (dmi) {
-               printk(KERN_DEBUG "%s: del %.2x:%.2x:%.2x:%.2x:%.2x:%.2x mcast address from vlan interface\n",
-                      dev->name,
-                      dmi->dmi_addr[0],
-                      dmi->dmi_addr[1],
-                      dmi->dmi_addr[2],
-                      dmi->dmi_addr[3],
-                      dmi->dmi_addr[4],
-                      dmi->dmi_addr[5]);
-               dev_mc_delete(dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
-               dmi = dev->mc_list;
-       }
+       if (ops->ndo_fcoe_enable)
+               rc = ops->ndo_fcoe_enable(real_dev);
+       return rc;
+}
+
+static int vlan_dev_fcoe_disable(struct net_device *dev)
+{
+       struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+       const struct net_device_ops *ops = real_dev->netdev_ops;
+       int rc = -EINVAL;
 
-       /* dev->mc_list is NULL by the time we get here. */
-       vlan_destroy_mc_list(VLAN_DEV_INFO(dev)->old_mc_list);
-       VLAN_DEV_INFO(dev)->old_mc_list = NULL;
+       if (ops->ndo_fcoe_disable)
+               rc = ops->ndo_fcoe_disable(real_dev);
+       return rc;
 }
 
-int vlan_dev_open(struct net_device *dev)
+static int vlan_dev_fcoe_get_wwn(struct net_device *dev, u64 *wwn, int type)
 {
-       if (!(VLAN_DEV_INFO(dev)->real_dev->flags & IFF_UP))
-               return -ENETDOWN;
+       struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+       const struct net_device_ops *ops = real_dev->netdev_ops;
+       int rc = -EINVAL;
 
-       return 0;
+       if (ops->ndo_fcoe_get_wwn)
+               rc = ops->ndo_fcoe_get_wwn(real_dev, wwn, type);
+       return rc;
 }
+#endif
 
-int vlan_dev_stop(struct net_device *dev)
+static void vlan_dev_change_rx_flags(struct net_device *dev, int change)
 {
-       vlan_flush_mc_list(dev);
-       return 0;
+       struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+
+       if (change & IFF_ALLMULTI)
+               dev_set_allmulti(real_dev, dev->flags & IFF_ALLMULTI ? 1 : -1);
+       if (change & IFF_PROMISC)
+               dev_set_promiscuity(real_dev, dev->flags & IFF_PROMISC ? 1 : -1);
 }
 
-int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+static void vlan_dev_set_rx_mode(struct net_device *vlan_dev)
 {
-       struct net_device *real_dev = VLAN_DEV_INFO(dev)->real_dev;
-       struct ifreq ifrr;
-       int err = -EOPNOTSUPP;
+       dev_mc_sync(vlan_dev_info(vlan_dev)->real_dev, vlan_dev);
+       dev_unicast_sync(vlan_dev_info(vlan_dev)->real_dev, vlan_dev);
+}
 
-       strncpy(ifrr.ifr_name, real_dev->name, IFNAMSIZ);
-       ifrr.ifr_ifru = ifr->ifr_ifru;
+/*
+ * vlan network devices have devices nesting below it, and are a special
+ * "super class" of normal network devices; split their locks off into a
+ * separate class since they always nest.
+ */
+static struct lock_class_key vlan_netdev_xmit_lock_key;
+static struct lock_class_key vlan_netdev_addr_lock_key;
 
-       switch(cmd) {
-       case SIOCGMIIPHY:
-       case SIOCGMIIREG:
-       case SIOCSMIIREG:
-               if (real_dev->do_ioctl && netif_device_present(real_dev))
-                       err = real_dev->do_ioctl(real_dev, &ifrr, cmd);
-               break;
+static void vlan_dev_set_lockdep_one(struct net_device *dev,
+                                    struct netdev_queue *txq,
+                                    void *_subclass)
+{
+       lockdep_set_class_and_subclass(&txq->_xmit_lock,
+                                      &vlan_netdev_xmit_lock_key,
+                                      *(int *)_subclass);
+}
+
+static void vlan_dev_set_lockdep_class(struct net_device *dev, int subclass)
+{
+       lockdep_set_class_and_subclass(&dev->addr_list_lock,
+                                      &vlan_netdev_addr_lock_key,
+                                      subclass);
+       netdev_for_each_tx_queue(dev, vlan_dev_set_lockdep_one, &subclass);
+}
 
-       case SIOCETHTOOL:
-               err = dev_ethtool(&ifrr);
+static const struct header_ops vlan_header_ops = {
+       .create  = vlan_dev_hard_header,
+       .rebuild = vlan_dev_rebuild_header,
+       .parse   = eth_header_parse,
+};
+
+static const struct net_device_ops vlan_netdev_ops, vlan_netdev_accel_ops;
+
+static int vlan_dev_init(struct net_device *dev)
+{
+       struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+       int subclass = 0;
+
+       netif_carrier_off(dev);
+
+       /* IFF_BROADCAST|IFF_MULTICAST; ??? */
+       dev->flags  = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI);
+       dev->iflink = real_dev->ifindex;
+       dev->state  = (real_dev->state & ((1<<__LINK_STATE_NOCARRIER) |
+                                         (1<<__LINK_STATE_DORMANT))) |
+                     (1<<__LINK_STATE_PRESENT);
+
+       dev->features |= real_dev->features & real_dev->vlan_features;
+       dev->gso_max_size = real_dev->gso_max_size;
+
+       /* ipv6 shared card related stuff */
+       dev->dev_id = real_dev->dev_id;
+
+       if (is_zero_ether_addr(dev->dev_addr))
+               memcpy(dev->dev_addr, real_dev->dev_addr, dev->addr_len);
+       if (is_zero_ether_addr(dev->broadcast))
+               memcpy(dev->broadcast, real_dev->broadcast, dev->addr_len);
+
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+       dev->fcoe_ddp_xid = real_dev->fcoe_ddp_xid;
+#endif
+
+       if (real_dev->features & NETIF_F_HW_VLAN_TX) {
+               dev->header_ops      = real_dev->header_ops;
+               dev->hard_header_len = real_dev->hard_header_len;
+               dev->netdev_ops         = &vlan_netdev_accel_ops;
+       } else {
+               dev->header_ops      = &vlan_header_ops;
+               dev->hard_header_len = real_dev->hard_header_len + VLAN_HLEN;
+               dev->netdev_ops         = &vlan_netdev_ops;
        }
 
-       if (!err)
-               ifr->ifr_ifru = ifrr.ifr_ifru;
+       if (is_vlan_dev(real_dev))
+               subclass = 1;
 
-       return err;
+       vlan_dev_set_lockdep_class(dev, subclass);
+
+       vlan_dev_info(dev)->vlan_rx_stats = alloc_percpu(struct vlan_rx_stats);
+       if (!vlan_dev_info(dev)->vlan_rx_stats)
+               return -ENOMEM;
+
+       return 0;
 }
 
-/** Taken from Gleb + Lennert's VLAN code, and modified... */
-void vlan_dev_set_multicast_list(struct net_device *vlan_dev)
+static void vlan_dev_uninit(struct net_device *dev)
 {
-       struct dev_mc_list *dmi;
-       struct net_device *real_dev;
-       int inc;
-
-       if (vlan_dev && (vlan_dev->priv_flags & IFF_802_1Q_VLAN)) {
-               /* Then it's a real vlan device, as far as we can tell.. */
-               real_dev = VLAN_DEV_INFO(vlan_dev)->real_dev;
+       struct vlan_priority_tci_mapping *pm;
+       struct vlan_dev_info *vlan = vlan_dev_info(dev);
+       int i;
 
-               /* compare the current promiscuity to the last promisc we had.. */
-               inc = vlan_dev->promiscuity - VLAN_DEV_INFO(vlan_dev)->old_promiscuity;
-               if (inc) {
-                       printk(KERN_INFO "%s: dev_set_promiscuity(master, %d)\n",
-                              vlan_dev->name, inc);
-                       dev_set_promiscuity(real_dev, inc); /* found in dev.c */
-                       VLAN_DEV_INFO(vlan_dev)->old_promiscuity = vlan_dev->promiscuity;
+       free_percpu(vlan->vlan_rx_stats);
+       vlan->vlan_rx_stats = NULL;
+       for (i = 0; i < ARRAY_SIZE(vlan->egress_priority_map); i++) {
+               while ((pm = vlan->egress_priority_map[i]) != NULL) {
+                       vlan->egress_priority_map[i] = pm->next;
+                       kfree(pm);
                }
+       }
+}
 
-               inc = vlan_dev->allmulti - VLAN_DEV_INFO(vlan_dev)->old_allmulti;
-               if (inc) {
-                       printk(KERN_INFO "%s: dev_set_allmulti(master, %d)\n",
-                              vlan_dev->name, inc);
-                       dev_set_allmulti(real_dev, inc); /* dev.c */
-                       VLAN_DEV_INFO(vlan_dev)->old_allmulti = vlan_dev->allmulti;
-               }
+static int vlan_ethtool_get_settings(struct net_device *dev,
+                                    struct ethtool_cmd *cmd)
+{
+       const struct vlan_dev_info *vlan = vlan_dev_info(dev);
+       return dev_ethtool_get_settings(vlan->real_dev, cmd);
+}
 
-               /* looking for addresses to add to master's list */
-               for (dmi = vlan_dev->mc_list; dmi != NULL; dmi = dmi->next) {
-                       if (vlan_should_add_mc(dmi, VLAN_DEV_INFO(vlan_dev)->old_mc_list)) {
-                               dev_mc_add(real_dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
-                               printk(KERN_DEBUG "%s: add %.2x:%.2x:%.2x:%.2x:%.2x:%.2x mcast address to master interface\n",
-                                      vlan_dev->name,
-                                      dmi->dmi_addr[0],
-                                      dmi->dmi_addr[1],
-                                      dmi->dmi_addr[2],
-                                      dmi->dmi_addr[3],
-                                      dmi->dmi_addr[4],
-                                      dmi->dmi_addr[5]);
-                       }
-               }
+static void vlan_ethtool_get_drvinfo(struct net_device *dev,
+                                    struct ethtool_drvinfo *info)
+{
+       strcpy(info->driver, vlan_fullname);
+       strcpy(info->version, vlan_version);
+       strcpy(info->fw_version, "N/A");
+}
 
-               /* looking for addresses to delete from master's list */
-               for (dmi = VLAN_DEV_INFO(vlan_dev)->old_mc_list; dmi != NULL; dmi = dmi->next) {
-                       if (vlan_should_add_mc(dmi, vlan_dev->mc_list)) {
-                               /* if we think we should add it to the new list, then we should really
-                                * delete it from the real list on the underlying device.
-                                */
-                               dev_mc_delete(real_dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
-                               printk(KERN_DEBUG "%s: del %.2x:%.2x:%.2x:%.2x:%.2x:%.2x mcast address from master interface\n",
-                                      vlan_dev->name,
-                                      dmi->dmi_addr[0],
-                                      dmi->dmi_addr[1],
-                                      dmi->dmi_addr[2],
-                                      dmi->dmi_addr[3],
-                                      dmi->dmi_addr[4],
-                                      dmi->dmi_addr[5]);
-                       }
-               }
+static u32 vlan_ethtool_get_rx_csum(struct net_device *dev)
+{
+       const struct vlan_dev_info *vlan = vlan_dev_info(dev);
+       return dev_ethtool_get_rx_csum(vlan->real_dev);
+}
+
+static u32 vlan_ethtool_get_flags(struct net_device *dev)
+{
+       const struct vlan_dev_info *vlan = vlan_dev_info(dev);
+       return dev_ethtool_get_flags(vlan->real_dev);
+}
+
+static struct net_device_stats *vlan_dev_get_stats(struct net_device *dev)
+{
+       struct net_device_stats *stats = &dev->stats;
 
-               /* save multicast list */
-               vlan_copy_mc_list(vlan_dev->mc_list, VLAN_DEV_INFO(vlan_dev));
+       dev_txq_stats_fold(dev, stats);
+
+       if (vlan_dev_info(dev)->vlan_rx_stats) {
+               struct vlan_rx_stats *p, rx = {0};
+               int i;
+
+               for_each_possible_cpu(i) {
+                       p = per_cpu_ptr(vlan_dev_info(dev)->vlan_rx_stats, i);
+                       rx.rx_packets += p->rx_packets;
+                       rx.rx_bytes   += p->rx_bytes;
+                       rx.rx_errors  += p->rx_errors;
+                       rx.multicast  += p->multicast;
+               }
+               stats->rx_packets = rx.rx_packets;
+               stats->rx_bytes   = rx.rx_bytes;
+               stats->rx_errors  = rx.rx_errors;
+               stats->multicast  = rx.multicast;
        }
+       return stats;
+}
+
+static const struct ethtool_ops vlan_ethtool_ops = {
+       .get_settings           = vlan_ethtool_get_settings,
+       .get_drvinfo            = vlan_ethtool_get_drvinfo,
+       .get_link               = ethtool_op_get_link,
+       .get_rx_csum            = vlan_ethtool_get_rx_csum,
+       .get_flags              = vlan_ethtool_get_flags,
+};
+
+static const struct net_device_ops vlan_netdev_ops = {
+       .ndo_change_mtu         = vlan_dev_change_mtu,
+       .ndo_init               = vlan_dev_init,
+       .ndo_uninit             = vlan_dev_uninit,
+       .ndo_open               = vlan_dev_open,
+       .ndo_stop               = vlan_dev_stop,
+       .ndo_start_xmit =  vlan_dev_hard_start_xmit,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_mac_address    = vlan_dev_set_mac_address,
+       .ndo_set_rx_mode        = vlan_dev_set_rx_mode,
+       .ndo_set_multicast_list = vlan_dev_set_rx_mode,
+       .ndo_change_rx_flags    = vlan_dev_change_rx_flags,
+       .ndo_do_ioctl           = vlan_dev_ioctl,
+       .ndo_neigh_setup        = vlan_dev_neigh_setup,
+       .ndo_get_stats          = vlan_dev_get_stats,
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+       .ndo_fcoe_ddp_setup     = vlan_dev_fcoe_ddp_setup,
+       .ndo_fcoe_ddp_done      = vlan_dev_fcoe_ddp_done,
+       .ndo_fcoe_enable        = vlan_dev_fcoe_enable,
+       .ndo_fcoe_disable       = vlan_dev_fcoe_disable,
+       .ndo_fcoe_get_wwn       = vlan_dev_fcoe_get_wwn,
+#endif
+};
+
+static const struct net_device_ops vlan_netdev_accel_ops = {
+       .ndo_change_mtu         = vlan_dev_change_mtu,
+       .ndo_init               = vlan_dev_init,
+       .ndo_uninit             = vlan_dev_uninit,
+       .ndo_open               = vlan_dev_open,
+       .ndo_stop               = vlan_dev_stop,
+       .ndo_start_xmit =  vlan_dev_hwaccel_hard_start_xmit,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_mac_address    = vlan_dev_set_mac_address,
+       .ndo_set_rx_mode        = vlan_dev_set_rx_mode,
+       .ndo_set_multicast_list = vlan_dev_set_rx_mode,
+       .ndo_change_rx_flags    = vlan_dev_change_rx_flags,
+       .ndo_do_ioctl           = vlan_dev_ioctl,
+       .ndo_neigh_setup        = vlan_dev_neigh_setup,
+       .ndo_get_stats          = vlan_dev_get_stats,
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+       .ndo_fcoe_ddp_setup     = vlan_dev_fcoe_ddp_setup,
+       .ndo_fcoe_ddp_done      = vlan_dev_fcoe_ddp_done,
+       .ndo_fcoe_enable        = vlan_dev_fcoe_enable,
+       .ndo_fcoe_disable       = vlan_dev_fcoe_disable,
+       .ndo_fcoe_get_wwn       = vlan_dev_fcoe_get_wwn,
+#endif
+};
+
+void vlan_setup(struct net_device *dev)
+{
+       ether_setup(dev);
+
+       dev->priv_flags         |= IFF_802_1Q_VLAN;
+       dev->priv_flags         &= ~IFF_XMIT_DST_RELEASE;
+       dev->tx_queue_len       = 0;
+
+       dev->netdev_ops         = &vlan_netdev_ops;
+       dev->destructor         = free_netdev;
+       dev->ethtool_ops        = &vlan_ethtool_ops;
+
+       memset(dev->broadcast, 0, ETH_ALEN);
 }