Commit 42fb06b3 authored by David Howells's avatar David Howells
Browse files

net: Change the udp encap_err_rcv to allow use of {ip,ipv6}_icmp_error() 



Change the udp encap_err_rcv signature to match ip_icmp_error() and
ipv6_icmp_error() so that those can be used from the called function and
export them.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
cc: netdev@vger.kernel.org
parent 8889a711

include/linux/udp.h

+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ struct udp_sock { 
	 * For encapsulation sockets.

	 */

	int (*encap_rcv)(struct sock *sk, struct sk_buff *skb);

	void (*encap_err_rcv)(struct sock *sk, struct sk_buff *skb, unsigned int udp_offset);

	void (*encap_err_rcv)(struct sock *sk, struct sk_buff *skb, int err,

			      __be16 port, u32 info, u8 *payload);

	int (*encap_err_lookup)(struct sock *sk, struct sk_buff *skb);

	void (*encap_destroy)(struct sock *sk);

include/net/udp_tunnel.h

+2 −2
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ typedef int (*udp_tunnel_encap_rcv_t)(struct sock *sk, struct sk_buff *skb); 
typedef int (*udp_tunnel_encap_err_lookup_t)(struct sock *sk,

					     struct sk_buff *skb);

typedef void (*udp_tunnel_encap_err_rcv_t)(struct sock *sk,

					   struct sk_buff *skb,

					   unsigned int udp_offset);

					   struct sk_buff *skb, int err,

					   __be16 port, u32 info, u8 *payload);

typedef void (*udp_tunnel_encap_destroy_t)(struct sock *sk);

typedef struct sk_buff *(*udp_tunnel_gro_receive_t)(struct sock *sk,

						    struct list_head *head,

net/ipv4/ip_sockglue.c

+1 −0
Original line number Diff line number Diff line
@@ -433,6 +433,7 @@ void ip_icmp_error(struct sock *sk, struct sk_buff *skb, int err, 
	}

	kfree_skb(skb);

}

EXPORT_SYMBOL_GPL(ip_icmp_error);



void ip_local_error(struct sock *sk, int err, __be32 daddr, __be16 port, u32 info)

{

net/ipv4/udp.c

+2 −1
Original line number Diff line number Diff line
@@ -784,7 +784,8 @@ int __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable) 
	if (tunnel) {

		/* ...not for tunnels though: we don't have a sending socket */

		if (udp_sk(sk)->encap_err_rcv)

			udp_sk(sk)->encap_err_rcv(sk, skb, iph->ihl << 2);

			udp_sk(sk)->encap_err_rcv(sk, skb, err, uh->dest, info,

						  (u8 *)(uh+1));

		goto out;

	}

	if (!inet->recverr) {

net/ipv6/datagram.c

+1 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ void ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err, 
	if (sock_queue_err_skb(sk, skb))

		kfree_skb(skb);

}

EXPORT_SYMBOL_GPL(ipv6_icmp_error);



void ipv6_local_error(struct sock *sk, int err, struct flowi6 *fl6, u32 info)

{