aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/netdevice.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index e7c49246fd88..1379c822e51d 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -454,6 +454,7 @@ struct netdev_queue {
454 struct Qdisc *qdisc; 454 struct Qdisc *qdisc;
455 struct Qdisc *qdisc_sleeping; 455 struct Qdisc *qdisc_sleeping;
456 struct list_head qdisc_list; 456 struct list_head qdisc_list;
457 struct netdev_queue *next_sched;
457}; 458};
458 459
459/* 460/*
@@ -545,8 +546,6 @@ struct net_device
545#define NETIF_F_V6_CSUM (NETIF_F_GEN_CSUM | NETIF_F_IPV6_CSUM) 546#define NETIF_F_V6_CSUM (NETIF_F_GEN_CSUM | NETIF_F_IPV6_CSUM)
546#define NETIF_F_ALL_CSUM (NETIF_F_V4_CSUM | NETIF_F_V6_CSUM) 547#define NETIF_F_ALL_CSUM (NETIF_F_V4_CSUM | NETIF_F_V6_CSUM)
547 548
548 struct net_device *next_sched;
549
550 /* Interface index. Unique device identifier */ 549 /* Interface index. Unique device identifier */
551 int ifindex; 550 int ifindex;
552 int iflink; 551 int iflink;
@@ -940,7 +939,7 @@ static inline int unregister_gifconf(unsigned int family)
940 */ 939 */
941struct softnet_data 940struct softnet_data
942{ 941{
943 struct net_device *output_queue; 942 struct netdev_queue *output_queue;
944 struct sk_buff_head input_pkt_queue; 943 struct sk_buff_head input_pkt_queue;
945 struct list_head poll_list; 944 struct list_head poll_list;
946 struct sk_buff *completion_queue; 945 struct sk_buff *completion_queue;