aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/pkt_sched.h
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2015-01-13 11:13:44 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-13 17:51:08 -0500
commitdf8a39defad46b83694ea6dd868d332976d62cc0 (patch)
treefe19bca0c2788033d49686babfc7b3853fa13340 /include/net/pkt_sched.h
parentd8b9605d2697c48fb822c821c5751afbb4567003 (diff)
net: rename vlan_tx_* helpers since "tx" is misleading there
The same macros are used for rx as well. So rename it. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/pkt_sched.h')
-rw-r--r--include/net/pkt_sched.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index fe6e7aac3c56..2342bf12cb78 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -121,7 +121,7 @@ static inline __be16 tc_skb_protocol(const struct sk_buff *skb)
121 * vlan accelerated path. In that case, use skb->vlan_proto 121 * vlan accelerated path. In that case, use skb->vlan_proto
122 * as the original vlan header was already stripped. 122 * as the original vlan header was already stripped.
123 */ 123 */
124 if (vlan_tx_tag_present(skb)) 124 if (skb_vlan_tag_present(skb))
125 return skb->vlan_proto; 125 return skb->vlan_proto;
126 return skb->protocol; 126 return skb->protocol;
127} 127}