diff options
| author | Joe Perches <joe@perches.com> | 2017-08-11 07:26:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-11 17:52:47 -0400 |
| commit | 0ed80da518a1f27562a013f106505e495e891fe4 (patch) | |
| tree | 22e0039a1df28cd8317dfbf2bd4b0b58dbca95a2 /net/openvswitch | |
| parent | 12acb133ece5a0b25b0984d31d870619966f63fe (diff) | |
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>
Diffstat (limited to 'net/openvswitch')
| -rw-r--r-- | net/openvswitch/conntrack.c | 14 | ||||
| -rw-r--r-- | net/openvswitch/flow_netlink.c | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index 03859e386b47..30d632509f82 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c | |||
| @@ -1180,15 +1180,13 @@ static int parse_nat(const struct nlattr *attr, | |||
| 1180 | int type = nla_type(a); | 1180 | int type = nla_type(a); |
| 1181 | 1181 | ||
| 1182 | if (type > OVS_NAT_ATTR_MAX) { | 1182 | if (type > OVS_NAT_ATTR_MAX) { |
| 1183 | OVS_NLERR(log, | 1183 | OVS_NLERR(log, "Unknown NAT attribute (type=%d, max=%d)", |
| 1184 | "Unknown NAT attribute (type=%d, max=%d).\n", | ||
| 1185 | type, OVS_NAT_ATTR_MAX); | 1184 | type, OVS_NAT_ATTR_MAX); |
| 1186 | return -EINVAL; | 1185 | return -EINVAL; |
| 1187 | } | 1186 | } |
| 1188 | 1187 | ||
| 1189 | if (nla_len(a) != ovs_nat_attr_lens[type][ip_vers]) { | 1188 | if (nla_len(a) != ovs_nat_attr_lens[type][ip_vers]) { |
| 1190 | OVS_NLERR(log, | 1189 | OVS_NLERR(log, "NAT attribute type %d has unexpected length (%d != %d)", |
| 1191 | "NAT attribute type %d has unexpected length (%d != %d).\n", | ||
| 1192 | type, nla_len(a), | 1190 | type, nla_len(a), |
| 1193 | ovs_nat_attr_lens[type][ip_vers]); | 1191 | ovs_nat_attr_lens[type][ip_vers]); |
| 1194 | return -EINVAL; | 1192 | return -EINVAL; |
| @@ -1198,9 +1196,7 @@ static int parse_nat(const struct nlattr *attr, | |||
| 1198 | case OVS_NAT_ATTR_SRC: | 1196 | case OVS_NAT_ATTR_SRC: |
| 1199 | case OVS_NAT_ATTR_DST: | 1197 | case OVS_NAT_ATTR_DST: |
| 1200 | if (info->nat) { | 1198 | if (info->nat) { |
| 1201 | OVS_NLERR(log, | 1199 | OVS_NLERR(log, "Only one type of NAT may be specified"); |
| 1202 | "Only one type of NAT may be specified.\n" | ||
| 1203 | ); | ||
| 1204 | return -ERANGE; | 1200 | return -ERANGE; |
| 1205 | } | 1201 | } |
| 1206 | info->nat |= OVS_CT_NAT; | 1202 | info->nat |= OVS_CT_NAT; |
| @@ -1245,13 +1241,13 @@ static int parse_nat(const struct nlattr *attr, | |||
| 1245 | break; | 1241 | break; |
| 1246 | 1242 | ||
| 1247 | default: | 1243 | default: |
| 1248 | OVS_NLERR(log, "Unknown nat attribute (%d).\n", type); | 1244 | OVS_NLERR(log, "Unknown nat attribute (%d)", type); |
| 1249 | return -EINVAL; | 1245 | return -EINVAL; |
| 1250 | } | 1246 | } |
| 1251 | } | 1247 | } |
| 1252 | 1248 | ||
| 1253 | if (rem > 0) { | 1249 | if (rem > 0) { |
| 1254 | OVS_NLERR(log, "NAT attribute has %d unknown bytes.\n", rem); | 1250 | OVS_NLERR(log, "NAT attribute has %d unknown bytes", rem); |
| 1255 | return -EINVAL; | 1251 | return -EINVAL; |
| 1256 | } | 1252 | } |
| 1257 | if (!info->nat) { | 1253 | if (!info->nat) { |
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index f07d10ac35d8..e8eb427ce6d1 100644 --- a/net/openvswitch/flow_netlink.c +++ b/net/openvswitch/flow_netlink.c | |||
| @@ -1255,7 +1255,7 @@ static int ovs_key_from_nlattrs(struct net *net, struct sw_flow_match *match, | |||
| 1255 | } | 1255 | } |
| 1256 | 1256 | ||
| 1257 | if (!is_mask && ipv6_key->ipv6_label & htonl(0xFFF00000)) { | 1257 | if (!is_mask && ipv6_key->ipv6_label & htonl(0xFFF00000)) { |
| 1258 | OVS_NLERR(log, "IPv6 flow label %x is out of range (max=%x).\n", | 1258 | OVS_NLERR(log, "IPv6 flow label %x is out of range (max=%x)", |
| 1259 | ntohl(ipv6_key->ipv6_label), (1 << 20) - 1); | 1259 | ntohl(ipv6_key->ipv6_label), (1 << 20) - 1); |
| 1260 | return -EINVAL; | 1260 | return -EINVAL; |
| 1261 | } | 1261 | } |
