netdev: Move gso_skb into netdev_queue.

[deliverable/linux.git] / include / linux / netdevice.h

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index e7c49246fd880771fb0031e4a264103f1f707943..aae6c6d153f2e93582f1dfaa45902076f5a9a0a7 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -452,8 +452,10 @@ struct netdev_queue {
        spinlock_t              lock;
        struct net_device       *dev;
        struct Qdisc            *qdisc;
+       struct sk_buff          *gso_skb;
        struct Qdisc            *qdisc_sleeping;
        struct list_head        qdisc_list;
+       struct netdev_queue     *next_sched;
 };
 
 /*
@@ -545,8 +547,6 @@ struct net_device
 #define NETIF_F_V6_CSUM                (NETIF_F_GEN_CSUM | NETIF_F_IPV6_CSUM)
 #define NETIF_F_ALL_CSUM       (NETIF_F_V4_CSUM | NETIF_F_V6_CSUM)
 
-       struct net_device       *next_sched;
-
        /* Interface index. Unique device identifier    */
        int                     ifindex;
        int                     iflink;
@@ -636,9 +636,6 @@ struct net_device
        struct netdev_queue     tx_queue ____cacheline_aligned_in_smp;
        unsigned long           tx_queue_len;   /* Max frames per queue allowed */
 
-       /* Partially transmitted GSO packet. */
-       struct sk_buff          *gso_skb;
-
 /*
  * One part is mostly used on xmit path (device)
  */
@@ -940,7 +937,7 @@ static inline int unregister_gifconf(unsigned int family)
  */
 struct softnet_data
 {
-       struct net_device       *output_queue;
+       struct netdev_queue     *output_queue;
        struct sk_buff_head     input_pkt_queue;
        struct list_head        poll_list;
        struct sk_buff          *completion_queue;