Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73df66f8 authored by Tom Parkin's avatar Tom Parkin Committed by David S. Miller
Browse files

ipv6: rename datagram_send_ctl and datagram_recv_ctl 



The datagram_*_ctl functions in net/ipv6/datagram.c are IPv6-specific.  Since
datagram_send_ctl is publicly exported it should be appropriately named to
reflect the fact that it's for IPv6 only.

Signed-off-by: default avatarTom Parkin <tparkin@katalix.com>
Signed-off-by: default avatarJames Chapman <jchapman@katalix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d6d7ab5

include/net/transp_v6.h

+11 −11
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ extern int udpv6_connect(struct sock *sk, 
						      struct sockaddr *uaddr,

						      int addr_len);



extern int			datagram_recv_ctl(struct sock *sk,

extern int			ip6_datagram_recv_ctl(struct sock *sk,

						      struct msghdr *msg,

						      struct sk_buff *skb);



extern int			datagram_send_ctl(struct net *net,

extern int			ip6_datagram_send_ctl(struct net *net,

						      struct sock *sk,

						      struct msghdr *msg,

						      struct flowi6 *fl6,

net/ipv6/datagram.c

+8 −7
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len) 
		if (skb->protocol == htons(ETH_P_IPV6)) {

			sin->sin6_addr = ipv6_hdr(skb)->saddr;

			if (np->rxopt.all)

				datagram_recv_ctl(sk, msg, skb);

				ip6_datagram_recv_ctl(sk, msg, skb);

			if (ipv6_addr_type(&sin->sin6_addr) & IPV6_ADDR_LINKLOCAL)

				sin->sin6_scope_id = IP6CB(skb)->iif;

		} else {
@@ -468,7 +468,8 @@ out: 
}





int datagram_recv_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb)

int ip6_datagram_recv_ctl(struct sock *sk, struct msghdr *msg,

			  struct sk_buff *skb)

{

	struct ipv6_pinfo *np = inet6_sk(sk);

	struct inet6_skb_parm *opt = IP6CB(skb);
@@ -598,7 +599,7 @@ int datagram_recv_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb) 
	return 0;

}



int datagram_send_ctl(struct net *net, struct sock *sk,

int ip6_datagram_send_ctl(struct net *net, struct sock *sk,

			  struct msghdr *msg, struct flowi6 *fl6,

			  struct ipv6_txoptions *opt,

			  int *hlimit, int *tclass, int *dontfrag)
@@ -871,4 +872,4 @@ int datagram_send_ctl(struct net *net, struct sock *sk, 
exit_f:

	return err;

}

EXPORT_SYMBOL_GPL(datagram_send_ctl);
 
EXPORT_SYMBOL_GPL(ip6_datagram_send_ctl);

net/ipv6/ip6_flowlabel.c

+2 −2
Original line number Diff line number Diff line
@@ -365,8 +365,8 @@ fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq, 
		msg.msg_control = (void*)(fl->opt+1);

		memset(&flowi6, 0, sizeof(flowi6));



		err = datagram_send_ctl(net, sk, &msg, &flowi6, fl->opt, &junk,

					&junk, &junk);

		err = ip6_datagram_send_ctl(net, sk, &msg, &flowi6, fl->opt,

					    &junk, &junk, &junk);

		if (err)

			goto done;

		err = -EINVAL;

net/ipv6/ipv6_sockglue.c

+3 −3
Original line number Diff line number Diff line
@@ -476,8 +476,8 @@ sticky_done: 
		msg.msg_controllen = optlen;

		msg.msg_control = (void*)(opt+1);



		retv = datagram_send_ctl(net, sk, &msg, &fl6, opt, &junk, &junk,

					 &junk);

		retv = ip6_datagram_send_ctl(net, sk, &msg, &fl6, opt, &junk,

					     &junk, &junk);

		if (retv)

			goto done;

update:
@@ -1002,7 +1002,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, 
		release_sock(sk);



		if (skb) {

			int err = datagram_recv_ctl(sk, &msg, skb);

			int err = ip6_datagram_recv_ctl(sk, &msg, skb);

			kfree_skb(skb);

			if (err)

				return err;

net/ipv6/raw.c

+3 −3
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk, 
	sock_recv_ts_and_drops(msg, sk, skb);



	if (np->rxopt.all)

		datagram_recv_ctl(sk, msg, skb);

		ip6_datagram_recv_ctl(sk, msg, skb);



	err = copied;

	if (flags & MSG_TRUNC)
@@ -822,7 +822,7 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk, 
		memset(opt, 0, sizeof(struct ipv6_txoptions));

		opt->tot_len = sizeof(struct ipv6_txoptions);



		err = datagram_send_ctl(sock_net(sk), sk, msg, &fl6, opt,

		err = ip6_datagram_send_ctl(sock_net(sk), sk, msg, &fl6, opt,

					    &hlimit, &tclass, &dontfrag);

		if (err < 0) {

			fl6_sock_release(flowlabel);