Commit 0ed80da5 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller

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: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarJoe Stringer <joe@ovn.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 12acb133
...@@ -1180,15 +1180,13 @@ static int parse_nat(const struct nlattr *attr, ...@@ -1180,15 +1180,13 @@ static int parse_nat(const struct nlattr *attr,
int type = nla_type(a); int type = nla_type(a);
if (type > OVS_NAT_ATTR_MAX) { if (type > OVS_NAT_ATTR_MAX) {
OVS_NLERR(log, OVS_NLERR(log, "Unknown NAT attribute (type=%d, max=%d)",
"Unknown NAT attribute (type=%d, max=%d).\n",
type, OVS_NAT_ATTR_MAX); type, OVS_NAT_ATTR_MAX);
return -EINVAL; return -EINVAL;
} }
if (nla_len(a) != ovs_nat_attr_lens[type][ip_vers]) { if (nla_len(a) != ovs_nat_attr_lens[type][ip_vers]) {
OVS_NLERR(log, OVS_NLERR(log, "NAT attribute type %d has unexpected length (%d != %d)",
"NAT attribute type %d has unexpected length (%d != %d).\n",
type, nla_len(a), type, nla_len(a),
ovs_nat_attr_lens[type][ip_vers]); ovs_nat_attr_lens[type][ip_vers]);
return -EINVAL; return -EINVAL;
...@@ -1198,9 +1196,7 @@ static int parse_nat(const struct nlattr *attr, ...@@ -1198,9 +1196,7 @@ static int parse_nat(const struct nlattr *attr,
case OVS_NAT_ATTR_SRC: case OVS_NAT_ATTR_SRC:
case OVS_NAT_ATTR_DST: case OVS_NAT_ATTR_DST:
if (info->nat) { if (info->nat) {
OVS_NLERR(log, OVS_NLERR(log, "Only one type of NAT may be specified");
"Only one type of NAT may be specified.\n"
);
return -ERANGE; return -ERANGE;
} }
info->nat |= OVS_CT_NAT; info->nat |= OVS_CT_NAT;
...@@ -1245,13 +1241,13 @@ static int parse_nat(const struct nlattr *attr, ...@@ -1245,13 +1241,13 @@ static int parse_nat(const struct nlattr *attr,
break; break;
default: default:
OVS_NLERR(log, "Unknown nat attribute (%d).\n", type); OVS_NLERR(log, "Unknown nat attribute (%d)", type);
return -EINVAL; return -EINVAL;
} }
} }
if (rem > 0) { 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; return -EINVAL;
} }
if (!info->nat) { if (!info->nat) {
......
...@@ -1255,7 +1255,7 @@ static int ovs_key_from_nlattrs(struct net *net, struct sw_flow_match *match, ...@@ -1255,7 +1255,7 @@ static int ovs_key_from_nlattrs(struct net *net, struct sw_flow_match *match,
} }
if (!is_mask && ipv6_key->ipv6_label & htonl(0xFFF00000)) { 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); ntohl(ipv6_key->ipv6_label), (1 << 20) - 1);
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment