projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Shorten flow tunneling flags.
[openvswitch]
/
datapath
/
flow.c
diff --git
a/datapath/flow.c
b/datapath/flow.c
index f33760aff11c6b3e356f6bcf633980e5b311aba9..fdfe3e9467119bb7a48effe37dea6c7187dcbc95 100644
(file)
--- a/
datapath/flow.c
+++ b/
datapath/flow.c
@@
-1034,7
+1034,7
@@
int ovs_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp,
if (!tun_key->ipv4_dst)
return -EINVAL;
if (!tun_key->ipv4_dst)
return -EINVAL;
- if (!(tun_key->tun_flags & OVS_
FLOW_
TNL_F_KEY))
+ if (!(tun_key->tun_flags & OVS_TNL_F_KEY))
return -EINVAL;
tun_id = nla_get_be64(a[OVS_KEY_ATTR_TUN_ID]);
return -EINVAL;
tun_id = nla_get_be64(a[OVS_KEY_ATTR_TUN_ID]);
@@
-1223,23
+1223,23
@@
int ovs_flow_metadata_from_nlattrs(struct sw_flow *flow, int key_len, const stru
tun_id = nla_get_be64(nla);
if (tun_key->ipv4_dst) {
tun_id = nla_get_be64(nla);
if (tun_key->ipv4_dst) {
- if (!(tun_key->tun_flags & OVS_
FLOW_
TNL_F_KEY))
+ if (!(tun_key->tun_flags & OVS_TNL_F_KEY))
return -EINVAL;
if (tun_key->tun_id != tun_id)
return -EINVAL;
break;
}
tun_key->tun_id = tun_id;
return -EINVAL;
if (tun_key->tun_id != tun_id)
return -EINVAL;
break;
}
tun_key->tun_id = tun_id;
- tun_key->tun_flags |= OVS_
FLOW_
TNL_F_KEY;
+ tun_key->tun_flags |= OVS_TNL_F_KEY;
break;
case OVS_KEY_ATTR_IPV4_TUNNEL:
break;
case OVS_KEY_ATTR_IPV4_TUNNEL:
- if (tun_key->tun_flags & OVS_
FLOW_
TNL_F_KEY) {
+ if (tun_key->tun_flags & OVS_TNL_F_KEY) {
tun_id = tun_key->tun_id;
memcpy(tun_key, nla_data(nla), sizeof(*tun_key));
tun_id = tun_key->tun_id;
memcpy(tun_key, nla_data(nla), sizeof(*tun_key));
- if (!(tun_key->tun_flags & OVS_
FLOW_
TNL_F_KEY))
+ if (!(tun_key->tun_flags & OVS_TNL_F_KEY))
return -EINVAL;
if (tun_key->tun_id != tun_id)
return -EINVAL;
if (tun_key->tun_id != tun_id)
@@
-1285,7
+1285,7
@@
int ovs_flow_to_nlattrs(const struct sw_flow_key *swkey, struct sk_buff *skb)
tun_key = nla_data(nla);
memcpy(tun_key, &swkey->phy.tun.tun_key, sizeof(*tun_key));
}
tun_key = nla_data(nla);
memcpy(tun_key, &swkey->phy.tun.tun_key, sizeof(*tun_key));
}
- if ((swkey->phy.tun.tun_key.tun_flags & OVS_
FLOW_
TNL_F_KEY) &&
+ if ((swkey->phy.tun.tun_key.tun_flags & OVS_TNL_F_KEY) &&
nla_put_be64(skb, OVS_KEY_ATTR_TUN_ID, swkey->phy.tun.tun_key.tun_id))
goto nla_put_failure;
nla_put_be64(skb, OVS_KEY_ATTR_TUN_ID, swkey->phy.tun.tun_key.tun_id))
goto nla_put_failure;