From 29361218f78c3cd27cc8ee96ef54ec72f0e5d913 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 15 Jul 2008 02:58:10 -0700 Subject: [PATCH] --- yaml --- r: 103588 b: refs/heads/master c: 6b0fb1261a4655613bed5dac0e935e733969e999 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index d2a29470912e..50747f6465fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd2ea0a79faad824258af5dcec1927aa24d81c16 +refs/heads/master: 6b0fb1261a4655613bed5dac0e935e733969e999 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index b5c1e7df64fc..a1c2c2204498 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -118,14 +118,6 @@ struct wireless_dev; #endif /* __KERNEL__ */ -struct net_device_subqueue -{ - /* Give a control state for each queue. This struct may contain - * per-queue locks in the future. - */ - unsigned long state; -}; - /* * Network device statistics. Akin to the 2.0 ether stats but * with byte counters. @@ -761,10 +753,6 @@ struct net_device /* for setting kernel sock attribute on TCP connection setup */ #define GSO_MAX_SIZE 65536 unsigned int gso_max_size; - - /* The TX queue control structures */ - unsigned int egress_subqueue_count; - struct net_device_subqueue egress_subqueue[1]; }; #define to_net_dev(d) container_of(d, struct net_device, dev)