diff options
| author | Greg Rose <gvrose8192@gmail.com> | 2017-09-11 14:10:58 -0700 |
|---|---|---|
| committer | Andy Zhou <azhou@ovn.org> | 2017-09-22 12:32:54 -0700 |
| commit | 72ef85ed5862b71c5936d43b8844d4fd26efe5ac (patch) | |
| tree | 642556f48965e5d6c2c97b0bdbb3379043e29802 /datapath | |
| parent | 657a6e892b11eea319bf9d5e4849ac909fc7ecf9 (diff) | |
| download | openvswitch-72ef85ed5862b71c5936d43b8844d4fd26efe5ac.tar.gz | |
datapath: Remove unnecessary newlines from OVS_NLERR uses
Upstream commit:
commit 0ed80da518a1f27562a013f106505e495e891fe4
Author: Joe Perches <joe@perches.com>
Date: Fri Aug 11 04:26:26 2017 -0700
openvswitch: Remove unnecessary newlines from OVS_NLERR uses
OVS_NLERR already adds a newline so these just add blank
lines to the logging.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Joe Stringer <joe@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Andy Zhou <azhou@ovn.org>
Diffstat (limited to 'datapath')
| -rw-r--r-- | datapath/conntrack.c | 14 | ||||
| -rw-r--r-- | datapath/flow_netlink.c | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/datapath/conntrack.c b/datapath/conntrack.c index b645ab101..d517a87b0 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -1221,15 +1221,13 @@ static int parse_nat(const struct nlattr *attr, int type = nla_type(a); if (type > OVS_NAT_ATTR_MAX) { - OVS_NLERR(log, - "Unknown NAT attribute (type=%d, max=%d).\n", + OVS_NLERR(log, "Unknown NAT attribute (type=%d, max=%d)", type, OVS_NAT_ATTR_MAX); return -EINVAL; } if (nla_len(a) != ovs_nat_attr_lens[type][ip_vers]) { - OVS_NLERR(log, - "NAT attribute type %d has unexpected length (%d != %d).\n", + OVS_NLERR(log, "NAT attribute type %d has unexpected length (%d != %d)", type, nla_len(a), ovs_nat_attr_lens[type][ip_vers]); return -EINVAL; @@ -1239,9 +1237,7 @@ static int parse_nat(const struct nlattr *attr, case OVS_NAT_ATTR_SRC: case OVS_NAT_ATTR_DST: if (info->nat) { - OVS_NLERR(log, - "Only one type of NAT may be specified.\n" - ); + OVS_NLERR(log, "Only one type of NAT may be specified"); return -ERANGE; } info->nat |= OVS_CT_NAT; @@ -1291,13 +1287,13 @@ static int parse_nat(const struct nlattr *attr, break; default: - OVS_NLERR(log, "Unknown nat attribute (%d).\n", type); + OVS_NLERR(log, "Unknown nat attribute (%d)", type); return -EINVAL; } } if (rem > 0) { - OVS_NLERR(log, "NAT attribute has %d unknown bytes.\n", rem); + OVS_NLERR(log, "NAT attribute has %d unknown bytes", rem); return -EINVAL; } if (!info->nat) { diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c index 9b4861250..df9d88ee5 100644 --- a/datapath/flow_netlink.c +++ b/datapath/flow_netlink.c @@ -1257,7 +1257,7 @@ static int ovs_key_from_nlattrs(struct net *net, struct sw_flow_match *match, } if (!is_mask && ipv6_key->ipv6_label & htonl(0xFFF00000)) { - OVS_NLERR(log, "IPv6 flow label %x is out of range (max=%x).\n", + OVS_NLERR(log, "IPv6 flow label %x is out of range (max=%x)", ntohl(ipv6_key->ipv6_label), (1 << 20) - 1); return -EINVAL; } |