summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJiri Pirko <jiri@mellanox.com>2017-03-06 16:39:54 +0100
committerDavid S. Miller <davem@davemloft.net>2017-03-08 23:08:57 -0800
commitc5ef188e9318694a073ceacb26011f62d7ed9b3f (patch)
tree914d295308045ee06bcbde56b615f946cc8d8026 /net
parentd5774b93f04252b81bd2c2cc84ec663c6aa798d1 (diff)
downloadop-kernel-dev-c5ef188e9318694a073ceacb26011f62d7ed9b3f.zip
op-kernel-dev-c5ef188e9318694a073ceacb26011f62d7ed9b3f.tar.gz
flow_dissector: rename "proto again" goto label
Align with "ip_proto_again" label used in the same function and rename vague "again" to "proto_again". Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/flow_dissector.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index cefaf23..9120835 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -267,7 +267,7 @@ bool __skb_flow_dissect(const struct sk_buff *skb,
memcpy(key_eth_addrs, &eth->h_dest, sizeof(*key_eth_addrs));
}
-again:
+proto_again:
switch (proto) {
case htons(ETH_P_IP): {
const struct iphdr *iph;
@@ -370,7 +370,7 @@ ipv6:
proto = vlan->h_vlan_encapsulated_proto;
nhoff += sizeof(*vlan);
if (skip_vlan)
- goto again;
+ goto proto_again;
}
skip_vlan = true;
@@ -393,7 +393,7 @@ ipv6:
}
}
- goto again;
+ goto proto_again;
}
case htons(ETH_P_PPP_SES): {
struct {
@@ -577,7 +577,7 @@ ip_proto_again:
if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP)
goto out_good;
- goto again;
+ goto proto_again;
}
case NEXTHDR_HOP:
case NEXTHDR_ROUTING:
OpenPOWER on IntegriCloud