mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

datapath: Account for "rename vlan_tx_* helpers since "tx" is misleading there"

Browse Source 
Upstream commit:
    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>

Upstream: df8a39d ("net: rename vlan_tx_* helpers since "tx" is misleading there")
Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
This commit is contained in:
Thomas Graf
2015-02-03 21:53:35 +01:00
parent 4fe0f20391
commit efd8a18e8d
12 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
datapath/linux/compat/skbuff-openvswitch.c
View File

@@ -179,7 +179,7 @@ int skb_vlan_pop(struct sk_buff *skb)
__be16 vlan_proto;
int err;
if (likely(vlan_tx_tag_present(skb))) {
if (likely(skb_vlan_tag_present(skb))) {
skb->vlan_tci = 0;
} else {
if (unlikely((skb->protocol != htons(ETH_P_8021Q) &&
@@ -210,7 +210,7 @@ int skb_vlan_pop(struct sk_buff *skb)
#ifndef HAVE_SKB_VLAN_PUSH
int skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci)
{
if (vlan_tx_tag_present(skb)) {
if (skb_vlan_tag_present(skb)) {
unsigned int offset = skb->data - skb_mac_header(skb);
int err;
@@ -220,7 +220,7 @@ int skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci)
*/
__skb_push(skb, offset);
err = __vlan_insert_tag(skb, skb->vlan_proto,
vlan_tx_tag_get(skb));
skb_vlan_tag_get(skb));
if (err)
return err;
skb->mac_len += VLAN_HLEN;