aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/skbuff.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-09 02:14:24 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-09 02:14:24 -0400
commitb19fa1fa91845234961c64dbd564671aa7c0fd27 (patch)
treeefb09da87299ef503b59396b69a7667f1650e378 /include/linux/skbuff.h
parentc773e847ea8f6812804e40f52399c6921a00eab1 (diff)
net: Delete NETDEVICES_MULTIQUEUE kconfig option.
Multiple TX queue support is a core networking feature. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r--include/linux/skbuff.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 2220b9e2dab0..8f10e3d08fd9 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -305,9 +305,7 @@ struct sk_buff {
305#endif 305#endif
306 306
307 int iif; 307 int iif;
308#ifdef CONFIG_NETDEVICES_MULTIQUEUE
309 __u16 queue_mapping; 308 __u16 queue_mapping;
310#endif
311#ifdef CONFIG_NET_SCHED 309#ifdef CONFIG_NET_SCHED
312 __u16 tc_index; /* traffic control index */ 310 __u16 tc_index; /* traffic control index */
313#ifdef CONFIG_NET_CLS_ACT 311#ifdef CONFIG_NET_CLS_ACT
@@ -1671,25 +1669,17 @@ static inline void skb_init_secmark(struct sk_buff *skb)
1671 1669
1672static inline void skb_set_queue_mapping(struct sk_buff *skb, u16 queue_mapping) 1670static inline void skb_set_queue_mapping(struct sk_buff *skb, u16 queue_mapping)
1673{ 1671{
1674#ifdef CONFIG_NETDEVICES_MULTIQUEUE
1675 skb->queue_mapping = queue_mapping; 1672 skb->queue_mapping = queue_mapping;
1676#endif
1677} 1673}
1678 1674
1679static inline u16 skb_get_queue_mapping(struct sk_buff *skb) 1675static inline u16 skb_get_queue_mapping(struct sk_buff *skb)
1680{ 1676{
1681#ifdef CONFIG_NETDEVICES_MULTIQUEUE
1682 return skb->queue_mapping; 1677 return skb->queue_mapping;
1683#else
1684 return 0;
1685#endif
1686} 1678}
1687 1679
1688static inline void skb_copy_queue_mapping(struct sk_buff *to, const struct sk_buff *from) 1680static inline void skb_copy_queue_mapping(struct sk_buff *to, const struct sk_buff *from)
1689{ 1681{
1690#ifdef CONFIG_NETDEVICES_MULTIQUEUE
1691 to->queue_mapping = from->queue_mapping; 1682 to->queue_mapping = from->queue_mapping;
1692#endif
1693} 1683}
1694 1684
1695static inline int skb_is_gso(const struct sk_buff *skb) 1685static inline int skb_is_gso(const struct sk_buff *skb)