tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Tom Parkin <tparkin@katalix.com>
Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Tom Parkin and committed by
David S. Miller 73df66f8 3d6d7ab5

+32 -31
+10 -10
include/net/transp_v6.h
··· 34 34 struct sockaddr *uaddr, 35 35 int addr_len); 36 36 37 - extern int datagram_recv_ctl(struct sock *sk, 38 - struct msghdr *msg, 39 - struct sk_buff *skb); 37 + extern int ip6_datagram_recv_ctl(struct sock *sk, 38 + struct msghdr *msg, 39 + struct sk_buff *skb); 40 40 41 - extern int datagram_send_ctl(struct net *net, 42 - struct sock *sk, 43 - struct msghdr *msg, 44 - struct flowi6 *fl6, 45 - struct ipv6_txoptions *opt, 46 - int *hlimit, int *tclass, 47 - int *dontfrag); 41 + extern int ip6_datagram_send_ctl(struct net *net, 42 + struct sock *sk, 43 + struct msghdr *msg, 44 + struct flowi6 *fl6, 45 + struct ipv6_txoptions *opt, 46 + int *hlimit, int *tclass, 47 + int *dontfrag); 48 48 49 49 #define LOOPBACK4_IPV6 cpu_to_be32(0x7f000006) 50 50
+8 -7
net/ipv6/datagram.c
··· 380 380 if (skb->protocol == htons(ETH_P_IPV6)) { 381 381 sin->sin6_addr = ipv6_hdr(skb)->saddr; 382 382 if (np->rxopt.all) 383 - datagram_recv_ctl(sk, msg, skb); 383 + ip6_datagram_recv_ctl(sk, msg, skb); 384 384 if (ipv6_addr_type(&sin->sin6_addr) & IPV6_ADDR_LINKLOCAL) 385 385 sin->sin6_scope_id = IP6CB(skb)->iif; 386 386 } else { ··· 468 468 } 469 469 470 470 471 - int datagram_recv_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb) 471 + int ip6_datagram_recv_ctl(struct sock *sk, struct msghdr *msg, 472 + struct sk_buff *skb) 472 473 { 473 474 struct ipv6_pinfo *np = inet6_sk(sk); 474 475 struct inet6_skb_parm *opt = IP6CB(skb); ··· 599 598 return 0; 600 599 } 601 600 602 - int datagram_send_ctl(struct net *net, struct sock *sk, 603 - struct msghdr *msg, struct flowi6 *fl6, 604 - struct ipv6_txoptions *opt, 605 - int *hlimit, int *tclass, int *dontfrag) 601 + int ip6_datagram_send_ctl(struct net *net, struct sock *sk, 602 + struct msghdr *msg, struct flowi6 *fl6, 603 + struct ipv6_txoptions *opt, 604 + int *hlimit, int *tclass, int *dontfrag) 606 605 { 607 606 struct in6_pktinfo *src_info; 608 607 struct cmsghdr *cmsg; ··· 872 871 exit_f: 873 872 return err; 874 873 } 875 - EXPORT_SYMBOL_GPL(datagram_send_ctl); 874 + EXPORT_SYMBOL_GPL(ip6_datagram_send_ctl);
+2 -2
net/ipv6/ip6_flowlabel.c
··· 365 365 msg.msg_control = (void*)(fl->opt+1); 366 366 memset(&flowi6, 0, sizeof(flowi6)); 367 367 368 - err = datagram_send_ctl(net, sk, &msg, &flowi6, fl->opt, &junk, 369 - &junk, &junk); 368 + err = ip6_datagram_send_ctl(net, sk, &msg, &flowi6, fl->opt, 369 + &junk, &junk, &junk); 370 370 if (err) 371 371 goto done; 372 372 err = -EINVAL;
+3 -3
net/ipv6/ipv6_sockglue.c
··· 476 476 msg.msg_controllen = optlen; 477 477 msg.msg_control = (void*)(opt+1); 478 478 479 - retv = datagram_send_ctl(net, sk, &msg, &fl6, opt, &junk, &junk, 480 - &junk); 479 + retv = ip6_datagram_send_ctl(net, sk, &msg, &fl6, opt, &junk, 480 + &junk, &junk); 481 481 if (retv) 482 482 goto done; 483 483 update: ··· 1002 1002 release_sock(sk); 1003 1003 1004 1004 if (skb) { 1005 - int err = datagram_recv_ctl(sk, &msg, skb); 1005 + int err = ip6_datagram_recv_ctl(sk, &msg, skb); 1006 1006 kfree_skb(skb); 1007 1007 if (err) 1008 1008 return err;
+3 -3
net/ipv6/raw.c
··· 507 507 sock_recv_ts_and_drops(msg, sk, skb); 508 508 509 509 if (np->rxopt.all) 510 - datagram_recv_ctl(sk, msg, skb); 510 + ip6_datagram_recv_ctl(sk, msg, skb); 511 511 512 512 err = copied; 513 513 if (flags & MSG_TRUNC) ··· 822 822 memset(opt, 0, sizeof(struct ipv6_txoptions)); 823 823 opt->tot_len = sizeof(struct ipv6_txoptions); 824 824 825 - err = datagram_send_ctl(sock_net(sk), sk, msg, &fl6, opt, 826 - &hlimit, &tclass, &dontfrag); 825 + err = ip6_datagram_send_ctl(sock_net(sk), sk, msg, &fl6, opt, 826 + &hlimit, &tclass, &dontfrag); 827 827 if (err < 0) { 828 828 fl6_sock_release(flowlabel); 829 829 return err;
+3 -3
net/ipv6/udp.c
··· 443 443 ip_cmsg_recv(msg, skb); 444 444 } else { 445 445 if (np->rxopt.all) 446 - datagram_recv_ctl(sk, msg, skb); 446 + ip6_datagram_recv_ctl(sk, msg, skb); 447 447 } 448 448 449 449 err = copied; ··· 1153 1153 memset(opt, 0, sizeof(struct ipv6_txoptions)); 1154 1154 opt->tot_len = sizeof(*opt); 1155 1155 1156 - err = datagram_send_ctl(sock_net(sk), sk, msg, &fl6, opt, 1157 - &hlimit, &tclass, &dontfrag); 1156 + err = ip6_datagram_send_ctl(sock_net(sk), sk, msg, &fl6, opt, 1157 + &hlimit, &tclass, &dontfrag); 1158 1158 if (err < 0) { 1159 1159 fl6_sock_release(flowlabel); 1160 1160 return err;
+2 -2
net/l2tp/l2tp_ip6.c
··· 554 554 memset(opt, 0, sizeof(struct ipv6_txoptions)); 555 555 opt->tot_len = sizeof(struct ipv6_txoptions); 556 556 557 - err = datagram_send_ctl(sock_net(sk), sk, msg, &fl6, opt, 558 - &hlimit, &tclass, &dontfrag); 557 + err = ip6_datagram_send_ctl(sock_net(sk), sk, msg, &fl6, opt, 558 + &hlimit, &tclass, &dontfrag); 559 559 if (err < 0) { 560 560 fl6_sock_release(flowlabel); 561 561 return err;
+1 -1
net/sunrpc/svcsock.c
··· 465 465 } 466 466 467 467 /* 468 - * See net/ipv6/datagram.c : datagram_recv_ctl 468 + * See net/ipv6/datagram.c : ip6_datagram_recv_ctl 469 469 */ 470 470 static int svc_udp_get_dest_address6(struct svc_rqst *rqstp, 471 471 struct cmsghdr *cmh)