Browse Source

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>
Jiri Pirko 8 years ago
parent
commit
c5ef188e93
1 changed files with 4 additions and 4 deletions
  1. 4 4
      net/core/flow_dissector.c

+ 4 - 4
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));
 		memcpy(key_eth_addrs, &eth->h_dest, sizeof(*key_eth_addrs));
 	}
 	}
 
 
-again:
+proto_again:
 	switch (proto) {
 	switch (proto) {
 	case htons(ETH_P_IP): {
 	case htons(ETH_P_IP): {
 		const struct iphdr *iph;
 		const struct iphdr *iph;
@@ -370,7 +370,7 @@ ipv6:
 			proto = vlan->h_vlan_encapsulated_proto;
 			proto = vlan->h_vlan_encapsulated_proto;
 			nhoff += sizeof(*vlan);
 			nhoff += sizeof(*vlan);
 			if (skip_vlan)
 			if (skip_vlan)
-				goto again;
+				goto proto_again;
 		}
 		}
 
 
 		skip_vlan = true;
 		skip_vlan = true;
@@ -393,7 +393,7 @@ ipv6:
 			}
 			}
 		}
 		}
 
 
-		goto again;
+		goto proto_again;
 	}
 	}
 	case htons(ETH_P_PPP_SES): {
 	case htons(ETH_P_PPP_SES): {
 		struct {
 		struct {
@@ -577,7 +577,7 @@ ip_proto_again:
 		if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP)
 		if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP)
 			goto out_good;
 			goto out_good;
 
 
-		goto again;
+		goto proto_again;
 	}
 	}
 	case NEXTHDR_HOP:
 	case NEXTHDR_HOP:
 	case NEXTHDR_ROUTING:
 	case NEXTHDR_ROUTING: