Commit 5fdaa88d authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller
Browse files

ipv6: fold sockcm_cookie into ipcm6_cookie 



ipcm_cookie includes sockcm_cookie. Do the same for ipcm6_cookie.

This reduces the number of arguments that need to be passed around,
applies ipcm6_init to all cookie fields at once and reduces code
differentiation between ipv4 and ipv6.

Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 657a0667

include/net/ipv6.h

+3 −4
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ struct ipv6_fl_socklist { 
};



struct ipcm6_cookie {

	struct sockcm_cookie sockc;

	__s16 hlimit;

	__s16 tclass;

	__s8  dontfrag;
@@ -959,8 +960,7 @@ int ip6_append_data(struct sock *sk, 
				int odd, struct sk_buff *skb),

		    void *from, int length, int transhdrlen,

		    struct ipcm6_cookie *ipc6, struct flowi6 *fl6,

		    struct rt6_info *rt, unsigned int flags,

		    const struct sockcm_cookie *sockc);

		    struct rt6_info *rt, unsigned int flags);



int ip6_push_pending_frames(struct sock *sk);
@@ -977,8 +977,7 @@ struct sk_buff *ip6_make_skb(struct sock *sk, 
			     void *from, int length, int transhdrlen,

			     struct ipcm6_cookie *ipc6, struct flowi6 *fl6,

			     struct rt6_info *rt, unsigned int flags,

			     struct inet_cork_full *cork,

			     const struct sockcm_cookie *sockc);

			     struct inet_cork_full *cork);



static inline struct sk_buff *ip6_finish_skb(struct sock *sk)

{

include/net/transp_v6.h

+1 −2
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ void ip6_datagram_recv_specific_ctl(struct sock *sk, struct msghdr *msg, 
				    struct sk_buff *skb);



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

			  struct flowi6 *fl6, struct ipcm6_cookie *ipc6,

			  struct sockcm_cookie *sockc);

			  struct flowi6 *fl6, struct ipcm6_cookie *ipc6);



void __ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,

			       __u16 srcp, __u16 destp, int rqueue, int bucket);

net/ipv6/datagram.c

+2 −2
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ EXPORT_SYMBOL_GPL(ip6_datagram_recv_ctl); 


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

			  struct msghdr *msg, struct flowi6 *fl6,

			  struct ipcm6_cookie *ipc6, struct sockcm_cookie *sockc)

			  struct ipcm6_cookie *ipc6)

{

	struct in6_pktinfo *src_info;

	struct cmsghdr *cmsg;
@@ -755,7 +755,7 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk, 
		}



		if (cmsg->cmsg_level == SOL_SOCKET) {

			err = __sock_cmsg_send(sk, msg, cmsg, sockc);

			err = __sock_cmsg_send(sk, msg, cmsg, &ipc6->sockc);

			if (err)

				return err;

			continue;

net/ipv6/icmp.c

+2 −5
Original line number Diff line number Diff line
@@ -430,7 +430,6 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info, 
	struct icmp6hdr tmp_hdr;

	struct flowi6 fl6;

	struct icmpv6_msg msg;

	struct sockcm_cookie sockc_unused = {0};

	struct ipcm6_cookie ipc6;

	int iif = 0;

	int addr_type = 0;
@@ -573,7 +572,7 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info, 
			    len + sizeof(struct icmp6hdr),

			    sizeof(struct icmp6hdr),

			    &ipc6, &fl6, (struct rt6_info *)dst,

			    MSG_DONTWAIT, &sockc_unused)) {

			    MSG_DONTWAIT)) {

		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTERRORS);

		ip6_flush_pending_frames(sk);

	} else {
@@ -677,7 +676,6 @@ static void icmpv6_echo_reply(struct sk_buff *skb) 
	struct dst_entry *dst;

	struct ipcm6_cookie ipc6;

	u32 mark = IP6_REPLY_MARK(net, skb->mark);

	struct sockcm_cookie sockc_unused = {0};



	saddr = &ipv6_hdr(skb)->daddr;
@@ -731,8 +729,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb) 
	if (ip6_append_data(sk, icmpv6_getfrag, &msg,

			    skb->len + sizeof(struct icmp6hdr),

			    sizeof(struct icmp6hdr), &ipc6, &fl6,

			    (struct rt6_info *)dst, MSG_DONTWAIT,

			    &sockc_unused)) {

			    (struct rt6_info *)dst, MSG_DONTWAIT)) {

		__ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTERRORS);

		ip6_flush_pending_frames(sk);

	} else {

net/ipv6/ip6_flowlabel.c

+1 −2
Original line number Diff line number Diff line
@@ -373,7 +373,6 @@ fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq, 
	if (olen > 0) {

		struct msghdr msg;

		struct flowi6 flowi6;

		struct sockcm_cookie sockc_junk;

		struct ipcm6_cookie ipc6;



		err = -ENOMEM;
@@ -392,7 +391,7 @@ fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq, 
		memset(&flowi6, 0, sizeof(flowi6));



		ipc6.opt = fl->opt;

		err = ip6_datagram_send_ctl(net, sk, &msg, &flowi6, &ipc6, &sockc_junk);

		err = ip6_datagram_send_ctl(net, sk, &msg, &flowi6, &ipc6);

		if (err)

			goto done;

		err = -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE