aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-08 19:55:56 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-08 19:55:56 -0400
commitbb949fbd1878973c3539d9aecff52f284482a937 (patch)
treee8bde854b18be79723502167c16e2131914a75b7 /include/linux/netdevice.h
parente65d22e18038eed7307276e46810d884c402d57d (diff)
netdev: Create netdev_queue abstraction.
A netdev_queue is an entity managed by a qdisc. Currently there is one RX and one TX queue, and a netdev_queue merely contains a backpointer to the net_device. The Qdisc struct is augmented with a netdev_queue pointer as well. Eventually the 'dev' Qdisc member will go away and we will have the resulting hierarchy: net_device --> netdev_queue --> Qdisc Also, qdisc_alloc() and qdisc_create_dflt() now take a netdev_queue pointer argument. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index e009c6fbf5cd..515fd25bf0fc 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -448,6 +448,10 @@ static inline void napi_synchronize(const struct napi_struct *n)
448# define napi_synchronize(n) barrier() 448# define napi_synchronize(n) barrier()
449#endif 449#endif
450 450
451struct netdev_queue {
452 struct net_device *dev;
453};
454
451/* 455/*
452 * The DEVICE structure. 456 * The DEVICE structure.
453 * Actually, this whole structure is a big mistake. It mixes I/O 457 * Actually, this whole structure is a big mistake. It mixes I/O
@@ -624,6 +628,9 @@ struct net_device
624 628
625 unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */ 629 unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */
626 630
631 struct netdev_queue rx_queue;
632 struct netdev_queue tx_queue;
633
627 /* ingress path synchronizer */ 634 /* ingress path synchronizer */
628 spinlock_t ingress_lock; 635 spinlock_t ingress_lock;
629 struct Qdisc *qdisc_ingress; 636 struct Qdisc *qdisc_ingress;