diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-15 23:14:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-17 22:21:18 -0400 |
commit | d3b753db7c4f1f37a98b51974d484fda5d86dab5 (patch) | |
tree | 6596288854d9626f935ddf9c014471a4c38b5c74 /include | |
parent | b4c21639ab0f6df07ab7624a8c2f974936708ae5 (diff) |
pkt_sched: Move gso_skb into Qdisc.
We liberate any dangling gso_skb during qdisc destruction.
It really only matters for the root qdisc. But when qdiscs
can be shared by multiple netdev_queue objects, we can't
have the gso_skb in the netdev_queue any more.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netdevice.h | 1 | ||||
-rw-r--r-- | include/net/sch_generic.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 787fbfc5aebb..0883fcf2d16a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -449,7 +449,6 @@ struct netdev_queue { | |||
449 | struct net_device *dev; | 449 | struct net_device *dev; |
450 | struct Qdisc *qdisc; | 450 | struct Qdisc *qdisc; |
451 | unsigned long state; | 451 | unsigned long state; |
452 | struct sk_buff *gso_skb; | ||
453 | spinlock_t _xmit_lock; | 452 | spinlock_t _xmit_lock; |
454 | int xmit_lock_owner; | 453 | int xmit_lock_owner; |
455 | struct Qdisc *qdisc_sleeping; | 454 | struct Qdisc *qdisc_sleeping; |
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index b47f556c66f8..b96c3d9e10a8 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h | |||
@@ -36,6 +36,7 @@ struct Qdisc | |||
36 | u32 handle; | 36 | u32 handle; |
37 | u32 parent; | 37 | u32 parent; |
38 | atomic_t refcnt; | 38 | atomic_t refcnt; |
39 | struct sk_buff *gso_skb; | ||
39 | struct sk_buff_head q; | 40 | struct sk_buff_head q; |
40 | struct netdev_queue *dev_queue; | 41 | struct netdev_queue *dev_queue; |
41 | struct list_head list; | 42 | struct list_head list; |