diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-09 08:01:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-09 08:01:27 +0200 |
| commit | 052979499c767268b912d25031ae524c451679d0 (patch) | |
| tree | 0873da6b42fb8a8b7cdcd033fced0f50731fd824 | |
| parent | net: Clean up explicit ->tx_queue references in link watch. (diff) | |
| download | linux-052979499c767268b912d25031ae524c451679d0.tar.xz linux-052979499c767268b912d25031ae524c451679d0.zip | |
pkt_sched: Add qdisc_tx_is_noop() helper and use in IPV6.
This indicates if the NOOP scheduler is what is active for TX on a
given device.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | include/net/sch_generic.h | 8 | ||||
| -rw-r--r-- | net/ipv6/addrconf.c | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index bf8f7264a778..5ba66b555578 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -250,6 +250,14 @@ static inline bool qdisc_tx_changing(struct net_device *dev) return (txq->qdisc != txq->qdisc_sleeping); } +/* Is the device using the noop qdisc? */ +static inline bool qdisc_tx_is_noop(const struct net_device *dev) +{ + const struct netdev_queue *txq = &dev->tx_queue; + + return (txq->qdisc == &noop_qdisc); +} + static inline int __qdisc_enqueue_tail(struct sk_buff *skb, struct Qdisc *sch, struct sk_buff_head *list) { diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 5c84c798331d..30184e0dd74c 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -229,10 +229,9 @@ const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_IN const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT; /* Check if a valid qdisc is available */ -static inline int addrconf_qdisc_ok(struct net_device *dev) +static inline bool addrconf_qdisc_ok(const struct net_device *dev) { - struct netdev_queue *txq = &dev->tx_queue; - return (txq->qdisc != &noop_qdisc); + return !qdisc_tx_is_noop(dev); } /* Check if a route is valid prefix route */ |