net: use software GSO for SG+CSUM capable netdevices

[linux-2.6] / net / 8021q / vlan_dev.c

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index c6678605fc0359e0a4b9a44ca16b8798d1c69589..4bf014e51f8c5ef0bf91ded6e6d074bb6291d60d 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -21,22 +21,15 @@
  */
 
 #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
@@ -307,53 +300,31 @@ static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         * 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;
+                       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_packets++;
        stats->tx_bytes += skb->len;
 
        skb->dev = vlan_dev_info(dev)->real_dev;
        dev_queue_xmit(skb);
-
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 static int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,
@@ -362,12 +333,6 @@ static int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,
        struct net_device_stats *stats = &dev->stats;
        u16 vlan_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)
-        */
        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);
@@ -377,8 +342,7 @@ static int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,
 
        skb->dev = vlan_dev_info(dev)->real_dev;
        dev_queue_xmit(skb);
-
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 static int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)
@@ -605,17 +569,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 = {