aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-10-21 20:01:29 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-22 05:59:56 -0400
commit4e3ab47a547616e583c7a5458beced6aa34c8ef3 (patch)
treeb889a8a472c657f706f91c4831c2fd5ee19f6a4e
parentdfa4091129019959f4608756f76dc687495287ad (diff)
[NET]: Make and use skb_get_queue_mapping
Make the helper for getting the field, symmetrical to the "set" one. Return 0 if CONFIG_NETDEVICES_MULTIQUEUE=n Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/cpmac.c2
-rw-r--r--include/linux/skbuff.h9
-rw-r--r--net/sched/sch_teql.c2
3 files changed, 11 insertions, 2 deletions
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index ed53aaab4c02..ae419736158e 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -471,7 +471,7 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
471 } 471 }
472 472
473 len = max(skb->len, ETH_ZLEN); 473 len = max(skb->len, ETH_ZLEN);
474 queue = skb->queue_mapping; 474 queue = skb_get_queue_mapping(skb);
475#ifdef CONFIG_NETDEVICES_MULTIQUEUE 475#ifdef CONFIG_NETDEVICES_MULTIQUEUE
476 netif_stop_subqueue(dev, queue); 476 netif_stop_subqueue(dev, queue);
477#else 477#else
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 369f60a4797d..ecb0edef0b39 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1769,6 +1769,15 @@ static inline void skb_set_queue_mapping(struct sk_buff *skb, u16 queue_mapping)
1769#endif 1769#endif
1770} 1770}
1771 1771
1772static inline u16 skb_get_queue_mapping(struct sk_buff *skb)
1773{
1774#ifdef CONFIG_NETDEVICES_MULTIQUEUE
1775 return skb->queue_mapping;
1776#else
1777 return 0;
1778#endif
1779}
1780
1772static inline void skb_copy_queue_mapping(struct sk_buff *to, const struct sk_buff *from) 1781static inline void skb_copy_queue_mapping(struct sk_buff *to, const struct sk_buff *from)
1773{ 1782{
1774#ifdef CONFIG_NETDEVICES_MULTIQUEUE 1783#ifdef CONFIG_NETDEVICES_MULTIQUEUE
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index be57cf317a7f..a9fad7162b5d 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -266,7 +266,7 @@ static int teql_master_xmit(struct sk_buff *skb, struct net_device *dev)
266 int busy; 266 int busy;
267 int nores; 267 int nores;
268 int len = skb->len; 268 int len = skb->len;
269 int subq = skb->queue_mapping; 269 int subq = skb_get_queue_mapping(skb);
270 struct sk_buff *skb_res = NULL; 270 struct sk_buff *skb_res = NULL;
271 271
272 start = master->slaves; 272 start = master->slaves;