Commit fd4b3558 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'icmp-move-duplicate-code-in-helper-functions' 



Matteo Croce says:

====================
icmp: move duplicate code in helper functions

Remove some duplicate code by moving it in two helper functions.
First patch adds the helpers, the second one uses it.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b8fed591 54074f1d

include/linux/icmp.h

+15 −0
Original line number Diff line number Diff line
@@ -20,4 +20,19 @@ static inline struct icmphdr *icmp_hdr(const struct sk_buff *skb) 
{

	return (struct icmphdr *)skb_transport_header(skb);

}



static inline bool icmp_is_err(int type)

{

	switch (type) {

	case ICMP_DEST_UNREACH:

	case ICMP_SOURCE_QUENCH:

	case ICMP_REDIRECT:

	case ICMP_TIME_EXCEEDED:

	case ICMP_PARAMETERPROB:

		return true;

	}



	return false;

}



#endif	/* _LINUX_ICMP_H */

include/linux/icmpv6.h

+14 −0
Original line number Diff line number Diff line
@@ -46,4 +46,18 @@ extern void icmpv6_flow_init(struct sock *sk, 
							 const struct in6_addr *saddr,

							 const struct in6_addr *daddr,

							 int oif);



static inline bool icmpv6_is_err(int type)

{

	switch (type) {

	case ICMPV6_DEST_UNREACH:

	case ICMPV6_PKT_TOOBIG:

	case ICMPV6_TIME_EXCEED:

	case ICMPV6_PARAMPROB:

		return true;

	}



	return false;

}



#endif

net/ipv4/netfilter/nf_socket_ipv4.c

+1 −9
Original line number Diff line number Diff line
@@ -31,16 +31,8 @@ extract_icmp4_fields(const struct sk_buff *skb, u8 *protocol, 
	if (icmph == NULL)

		return 1;



	switch (icmph->type) {

	case ICMP_DEST_UNREACH:

	case ICMP_SOURCE_QUENCH:

	case ICMP_REDIRECT:

	case ICMP_TIME_EXCEEDED:

	case ICMP_PARAMETERPROB:

		break;

	default:

	if (!icmp_is_err(icmph->type))

		return 1;

	}



	inside_iph = skb_header_pointer(skb, outside_hdrlen +

					sizeof(struct icmphdr),

net/ipv4/route.c

+1 −4
Original line number Diff line number Diff line
@@ -1894,10 +1894,7 @@ static void ip_multipath_l3_keys(const struct sk_buff *skb, 
	if (!icmph)

		goto out;



	if (icmph->type != ICMP_DEST_UNREACH &&

	    icmph->type != ICMP_REDIRECT &&

	    icmph->type != ICMP_TIME_EXCEEDED &&

	    icmph->type != ICMP_PARAMETERPROB)

	if (!icmp_is_err(icmph->type))

		goto out;



	inner_iph = skb_header_pointer(skb,

net/ipv6/route.c

+1 −4
Original line number Diff line number Diff line
@@ -2291,10 +2291,7 @@ static void ip6_multipath_l3_keys(const struct sk_buff *skb, 
	if (!icmph)

		goto out;



	if (icmph->icmp6_type != ICMPV6_DEST_UNREACH &&

	    icmph->icmp6_type != ICMPV6_PKT_TOOBIG &&

	    icmph->icmp6_type != ICMPV6_TIME_EXCEED &&

	    icmph->icmp6_type != ICMPV6_PARAMPROB)

	if (!icmpv6_is_err(icmph->icmp6_type))

		goto out;



	inner_iph = skb_header_pointer(skb,