net: Potential null skb->dev dereference
[linux-2.6.git] / net / 8021q / vlan_dev.c
index c667860..9e83272 100644 (file)
  */
 
 #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 <linux/ethtool.h>
-#include <net/datalink.h>
-#include <net/p8022.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
@@ -55,7 +48,7 @@ static int vlan_dev_rebuild_header(struct sk_buff *skb)
 
        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);
@@ -147,7 +140,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
                  struct packet_type *ptype, struct net_device *orig_dev)
 {
        struct vlan_hdr *vhdr;
-       struct net_device_stats *stats;
+       struct vlan_rx_stats *rx_stats;
        u16 vlan_id;
        u16 vlan_tci;
 
@@ -170,11 +163,10 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
                goto err_unlock;
        }
 
-       skb->dev->last_rx = jiffies;
-
-       stats = &skb->dev->stats;
-       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;
 
        skb_pull_rcsum(skb, VLAN_HLEN);
 
@@ -189,7 +181,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
                break;
 
        case PACKET_MULTICAST:
-               stats->multicast++;
+               rx_stats->multicast++;
                break;
 
        case PACKET_OTHERHOST:
@@ -209,7 +201,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
 
        skb = vlan_check_reorder_header(skb);
        if (!skb) {
-               stats->rx_errors++;
+               rx_stats->rx_errors++;
                goto err_unlock;
        }
 
@@ -271,11 +263,10 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
                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
                        vhdr->h_vlan_encapsulated_proto = htons(len);
@@ -297,88 +288,77 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
        return rc;
 }
 
-static 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 = &dev->stats;
+       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) {
-               int orig_headroom = skb_headroom(skb);
+           vlan_dev_info(dev)->flags & VLAN_FLAG_REORDER_HDR) {
+               unsigned int orig_headroom = skb_headroom(skb);
                u16 vlan_tci;
 
-               /* This is not a VLAN frame...but we can fix that! */
                vlan_dev_info(dev)->cnt_encap_on_xmit++;
 
-               pr_debug("%s: proto to encap: 0x%hx\n",
-                        __func__, ntohs(veth->h_vlan_proto));
-               /* 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)
-                */
                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++;
        }
 
-       pr_debug("%s: about to send skb: %p to dev: %s\n",
-               __func__, skb, skb->dev->name);
-       pr_debug("  " MAC_FMT " " MAC_FMT " %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);
 
-       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;
 }
 
-static 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 = &dev->stats;
+       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;
 
-       /* 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)
-        */
        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);
 
-       stats->tx_packets++;
-       stats->tx_bytes += skb->len;
-
        skb->dev = vlan_dev_info(dev)->real_dev;
-       dev_queue_xmit(skb);
+       len = skb->len;
+       ret = dev_queue_xmit(skb);
 
-       return 0;
+       if (likely(ret == NET_XMIT_SUCCESS)) {
+               txq->tx_packets++;
+               txq->tx_bytes += len;
+       } else
+               txq->tx_dropped++;
+
+       return ret;
 }
 
 static int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)
@@ -413,7 +393,7 @@ int vlan_dev_set_egress_priority(const struct net_device *dev,
        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 << 13) & 0xE000;
+       u32 vlan_qos = (vlan_prio << VLAN_PRIO_SHIFT) & VLAN_PRIO_MASK;
 
        /* See if a priority mapping exists.. */
        mp = vlan->egress_priority_map[skb_prio & 0xF];
@@ -450,7 +430,8 @@ int vlan_dev_change_flags(const struct net_device *dev, u32 flags, u32 mask)
        struct vlan_dev_info *vlan = vlan_dev_info(dev);
        u32 old_flags = vlan->flags;
 
-       if (mask & ~(VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP))
+       if (mask & ~(VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP |
+                    VLAN_FLAG_LOOSE_BINDING))
                return -EINVAL;
 
        vlan->flags = (old_flags & ~mask) | (flags & mask);
@@ -475,11 +456,12 @@ static int vlan_dev_open(struct net_device *dev)
        struct net_device *real_dev = vlan->real_dev;
        int err;
 
-       if (!(real_dev->flags & IFF_UP))
+       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, ETH_ALEN);
+               err = dev_unicast_add(real_dev, dev->dev_addr);
                if (err < 0)
                        goto out;
        }
@@ -500,6 +482,7 @@ static int vlan_dev_open(struct net_device *dev)
        if (vlan->flags & VLAN_FLAG_GVRP)
                vlan_gvrp_request_join(dev);
 
+       netif_carrier_on(dev);
        return 0;
 
 clear_allmulti:
@@ -507,8 +490,9 @@ clear_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, ETH_ALEN);
+               dev_unicast_delete(real_dev, dev->dev_addr);
 out:
+       netif_carrier_off(dev);
        return err;
 }
 
@@ -528,8 +512,9 @@ static int vlan_dev_stop(struct net_device *dev)
                dev_set_promiscuity(real_dev, -1);
 
        if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr))
-               dev_unicast_delete(real_dev, dev->dev_addr, dev->addr_len);
+               dev_unicast_delete(real_dev, dev->dev_addr);
 
+       netif_carrier_off(dev);
        return 0;
 }
 
@@ -546,13 +531,13 @@ static int vlan_dev_set_mac_address(struct net_device *dev, void *p)
                goto out;
 
        if (compare_ether_addr(addr->sa_data, real_dev->dev_addr)) {
-               err = dev_unicast_add(real_dev, addr->sa_data, ETH_ALEN);
+               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, ETH_ALEN);
+               dev_unicast_delete(real_dev, dev->dev_addr);
 
 out:
        memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
@@ -562,6 +547,7 @@ out:
 static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
        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;
 
@@ -572,8 +558,8 @@ static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int 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);
+               if (netif_device_present(real_dev) && ops->ndo_do_ioctl)
+                       err = ops->ndo_do_ioctl(real_dev, &ifrr, cmd);
                break;
        }
 
@@ -583,6 +569,78 @@ static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        return err;
 }
 
+static int vlan_dev_neigh_setup(struct net_device *dev, struct neigh_parms *pa)
+{
+       struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+       const struct net_device_ops *ops = real_dev->netdev_ops;
+       int err = 0;
+
+       if (netif_device_present(real_dev) && ops->ndo_neigh_setup)
+               err = ops->ndo_neigh_setup(real_dev, pa);
+
+       return err;
+}
+
+#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 net_device *real_dev = vlan_dev_info(dev)->real_dev;
+       const struct net_device_ops *ops = real_dev->netdev_ops;
+       int rc = 0;
+
+       if (ops->ndo_fcoe_ddp_setup)
+               rc = ops->ndo_fcoe_ddp_setup(real_dev, xid, sgl, sgc);
+
+       return rc;
+}
+
+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 int vlan_dev_fcoe_enable(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;
+
+       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;
+
+       if (ops->ndo_fcoe_disable)
+               rc = ops->ndo_fcoe_disable(real_dev);
+       return rc;
+}
+
+static int vlan_dev_fcoe_get_wwn(struct net_device *dev, u64 *wwn, int type)
+{
+       struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+       const struct net_device_ops *ops = real_dev->netdev_ops;
+       int rc = -EINVAL;
+
+       if (ops->ndo_fcoe_get_wwn)
+               rc = ops->ndo_fcoe_get_wwn(real_dev, wwn, type);
+       return rc;
+}
+#endif
+
 static void vlan_dev_change_rx_flags(struct net_device *dev, int change)
 {
        struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
@@ -605,17 +663,23 @@ static void vlan_dev_set_rx_mode(struct net_device *vlan_dev)
  * 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;
 
-static void vlan_dev_set_lockdep_one(struct netdev_queue *txq,
-                                    int subclass)
+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, subclass);
+                                      &vlan_netdev_xmit_lock_key,
+                                      *(int *)_subclass);
 }
 
 static void vlan_dev_set_lockdep_class(struct net_device *dev, int subclass)
 {
-       vlan_dev_set_lockdep_one(&dev->tx_queue, 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);
 }
 
 static const struct header_ops vlan_header_ops = {
@@ -624,11 +688,15 @@ static const struct header_ops vlan_header_ops = {
        .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;
@@ -637,6 +705,7 @@ static int vlan_dev_init(struct net_device *dev)
                      (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;
@@ -646,20 +715,29 @@ static int vlan_dev_init(struct net_device *dev)
        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->hard_start_xmit = vlan_dev_hwaccel_hard_start_xmit;
+               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->hard_start_xmit = vlan_dev_hard_start_xmit;
+               dev->netdev_ops         = &vlan_netdev_ops;
        }
 
        if (is_vlan_dev(real_dev))
                subclass = 1;
 
        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;
 }
 
@@ -669,6 +747,8 @@ static void vlan_dev_uninit(struct net_device *dev)
        struct vlan_dev_info *vlan = vlan_dev_info(dev);
        int i;
 
+       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;
@@ -677,52 +757,123 @@ static void vlan_dev_uninit(struct net_device *dev)
        }
 }
 
-static u32 vlan_ethtool_get_rx_csum(struct net_device *dev)
+static int vlan_ethtool_get_settings(struct net_device *dev,
+                                    struct ethtool_cmd *cmd)
 {
        const struct vlan_dev_info *vlan = vlan_dev_info(dev);
-       struct net_device *real_dev = vlan->real_dev;
+       return dev_ethtool_get_settings(vlan->real_dev, cmd);
+}
 
-       if (real_dev->ethtool_ops == NULL ||
-           real_dev->ethtool_ops->get_rx_csum == NULL)
-               return 0;
-       return real_dev->ethtool_ops->get_rx_csum(real_dev);
+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");
+}
+
+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);
-       struct net_device *real_dev = vlan->real_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;
 
-       if (!(real_dev->features & NETIF_F_HW_VLAN_RX) ||
-           real_dev->ethtool_ops == NULL ||
-           real_dev->ethtool_ops->get_flags == NULL)
-               return 0;
-       return real_dev->ethtool_ops->get_flags(real_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->change_mtu         = vlan_dev_change_mtu;
-       dev->init               = vlan_dev_init;
-       dev->uninit             = vlan_dev_uninit;
-       dev->open               = vlan_dev_open;
-       dev->stop               = vlan_dev_stop;
-       dev->set_mac_address    = vlan_dev_set_mac_address;
-       dev->set_rx_mode        = vlan_dev_set_rx_mode;
-       dev->set_multicast_list = vlan_dev_set_rx_mode;
-       dev->change_rx_flags    = vlan_dev_change_rx_flags;
-       dev->do_ioctl           = vlan_dev_ioctl;
+       dev->netdev_ops         = &vlan_netdev_ops;
        dev->destructor         = free_netdev;
        dev->ethtool_ops        = &vlan_ethtool_ops;