From 16512f1c1daeba6fc06323c26f955d335256ca81 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 8 Jul 2008 23:01:27 -0700 Subject: [PATCH] --- yaml --- r: 103396 b: refs/heads/master c: 052979499c767268b912d25031ae524c451679d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/sch_generic.h | 8 ++++++++ trunk/net/ipv6/addrconf.c | 5 ++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7a14f9f0f73a..f7771c8e7449 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fa9864b53f0680e432a2c431c2cf2055daa3a88 +refs/heads/master: 052979499c767268b912d25031ae524c451679d0 diff --git a/trunk/include/net/sch_generic.h b/trunk/include/net/sch_generic.h index bf8f7264a778..5ba66b555578 100644 --- a/trunk/include/net/sch_generic.h +++ b/trunk/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/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c index 5c84c798331d..30184e0dd74c 100644 --- a/trunk/net/ipv6/addrconf.c +++ b/trunk/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 */