flow_dissector: rename "proto again" goto label
authorJiri Pirko <jiri@mellanox.com>
Mon, 6 Mar 2017 15:39:54 +0000 (16:39 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Mar 2017 07:08:57 +0000 (23:08 -0800)
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>
net/core/flow_dissector.c

index cefaf2368a3fe038d15067d7a29f62b4ec3c7b7b..91208357659418846c21fda41c9c486997656414 100644 (file)
@@ -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: