summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/net/sch_generic.h8
-rw-r--r--net/ipv6/addrconf.c5
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 */