projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tunneling: Add missing rcu_dereference() to cache cleaner.
[openvswitch]
/
lib
/
odp-util.c
diff --git
a/lib/odp-util.c
b/lib/odp-util.c
index 0c8caabb0c9014b9f550c53da182417bec72e7e2..6b4f5fada567e7c7c9a28e300f6c3d0cf718faf3 100644
(file)
--- a/
lib/odp-util.c
+++ b/
lib/odp-util.c
@@
-42,8
+42,8
@@
odp_actions_add(struct odp_actions *actions, uint16_t type)
void
format_odp_flow_key(struct ds *ds, const struct odp_flow_key *key)
{
void
format_odp_flow_key(struct ds *ds, const struct odp_flow_key *key)
{
- ds_put_format(ds, "tun_id
0x%08x
in_port%d tci(",
-
key->tun_id
, key->in_port);
+ ds_put_format(ds, "tun_id
%#"PRIx32"
in_port%d tci(",
+
ntohl(key->tun_id)
, key->in_port);
if (key->dl_tci) {
ds_put_format(ds, "vlan%"PRIu16",pcp%d",
vlan_tci_to_vid(key->dl_tci),
if (key->dl_tci) {
ds_put_format(ds, "vlan%"PRIu16",pcp%d",
vlan_tci_to_vid(key->dl_tci),
@@
-70,7
+70,7
@@
format_odp_action(struct ds *ds, const union odp_action *a)
ds_put_format(ds, "ctl(%"PRIu32")", a->controller.arg);
break;
case ODPAT_SET_TUNNEL:
ds_put_format(ds, "ctl(%"PRIu32")", a->controller.arg);
break;
case ODPAT_SET_TUNNEL:
- ds_put_format(ds, "set_tunnel(
0x%08
"PRIx32")", ntohl(a->tunnel.tun_id));
+ ds_put_format(ds, "set_tunnel(
%#
"PRIx32")", ntohl(a->tunnel.tun_id));
break;
case ODPAT_SET_DL_TCI:
ds_put_format(ds, "set_tci(vid=%"PRIu16",pcp=%d)",
break;
case ODPAT_SET_DL_TCI:
ds_put_format(ds, "set_tci(vid=%"PRIu16",pcp=%d)",