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

Commit 4d52cfbe authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: ipv4/ip_sockglue.c cleanups 



Pure cleanups

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dae9de8e

net/ipv4/ip_sockglue.c

+36 −37
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ void ip_cmsg_recv(struct msghdr *msg, struct sk_buff *skb) 
		ip_cmsg_recv_dstaddr(msg, skb);



}

EXPORT_SYMBOL(ip_cmsg_recv);



int ip_cmsg_send(struct net *net, struct msghdr *msg, struct ipcm_cookie *ipc)

{
@@ -203,7 +204,8 @@ int ip_cmsg_send(struct net *net, struct msghdr *msg, struct ipcm_cookie *ipc) 
		switch (cmsg->cmsg_type) {

		case IP_RETOPTS:

			err = cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr));

			err = ip_options_get(net, &ipc->opt, CMSG_DATA(cmsg), err < 40 ? err : 40);

			err = ip_options_get(net, &ipc->opt, CMSG_DATA(cmsg),

					     err < 40 ? err : 40);

			if (err)

				return err;

			break;
@@ -238,7 +240,8 @@ int ip_cmsg_send(struct net *net, struct msghdr *msg, struct ipcm_cookie *ipc) 
struct ip_ra_chain *ip_ra_chain;

DEFINE_RWLOCK(ip_ra_lock);



int ip_ra_control(struct sock *sk, unsigned char on, void (*destructor)(struct sock *))

int ip_ra_control(struct sock *sk, unsigned char on,

		  void (*destructor)(struct sock *))

{

	struct ip_ra_chain *ra, *new_ra, **rap;
@@ -416,7 +419,8 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len) 
	/* Reset and regenerate socket error */

	spin_lock_bh(&sk->sk_error_queue.lock);

	sk->sk_err = 0;

	if ((skb2 = skb_peek(&sk->sk_error_queue)) != NULL) {

	skb2 = skb_peek(&sk->sk_error_queue);

	if (skb2 != NULL) {

		sk->sk_err = SKB_EXT_ERR(skb2)->ee.ee_errno;

		spin_unlock_bh(&sk->sk_error_queue.lock);

		sk->sk_error_report(sk);
@@ -431,8 +435,8 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len) 




/*

 *	Socket option code for IP. This is the end of the line after any TCP,UDP etc options on

 *	an IP socket.

 *	Socket option code for IP. This is the end of the line after any

 *	TCP,UDP etc options on an IP socket.

 */



static int do_ip_setsockopt(struct sock *sk, int level,
@@ -558,7 +562,7 @@ static int do_ip_setsockopt(struct sock *sk, int level, 
	case IP_TTL:

		if (optlen < 1)

			goto e_inval;

		if (val != -1 && (val < 1 || val>255))

		if (val != -1 && (val < 0 || val > 255))

			goto e_inval;

		inet->uc_ttl = val;

		break;
@@ -613,7 +617,8 @@ static int do_ip_setsockopt(struct sock *sk, int level, 
		} else {

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

			if (optlen >= sizeof(struct in_addr) &&

			    copy_from_user(&mreq.imr_address, optval, sizeof(struct in_addr)))

			    copy_from_user(&mreq.imr_address, optval,

					   sizeof(struct in_addr)))

				break;

		}
@@ -677,7 +682,6 @@ static int do_ip_setsockopt(struct sock *sk, int level, 
	}

	case IP_MSFILTER:

	{

		extern int sysctl_igmp_max_msf;

		struct ip_msfilter *msf;



		if (optlen < IP_MSFILTER_SIZE(0))
@@ -831,7 +835,6 @@ static int do_ip_setsockopt(struct sock *sk, int level, 
	}

	case MCAST_MSFILTER:

	{

		extern int sysctl_igmp_max_msf;

		struct sockaddr_in *psin;

		struct ip_msfilter *msf = NULL;

		struct group_filter *gsf = NULL;
@@ -849,9 +852,9 @@ static int do_ip_setsockopt(struct sock *sk, int level, 
			break;

		}

		err = -EFAULT;

		if (copy_from_user(gsf, optval, optlen)) {

		if (copy_from_user(gsf, optval, optlen))

			goto mc_msf_out;

		}



		/* numsrc >= (4G-140)/128 overflow in 32 bits */

		if (gsf->gf_numsrc >= 0x1ffffff ||

		    gsf->gf_numsrc > sysctl_igmp_max_msf) {
@@ -957,6 +960,7 @@ int ip_setsockopt(struct sock *sk, int level, 
#endif

	return err;

}

EXPORT_SYMBOL(ip_setsockopt);



#ifdef CONFIG_COMPAT

int compat_ip_setsockopt(struct sock *sk, int level, int optname,
@@ -986,13 +990,12 @@ int compat_ip_setsockopt(struct sock *sk, int level, int optname, 
#endif

	return err;

}



EXPORT_SYMBOL(compat_ip_setsockopt);

#endif



/*

 *	Get the options. Note for future reference. The GET of IP options gets the

 *	_received_ ones. The set sets the _sent_ ones.

 *	Get the options. Note for future reference. The GET of IP options gets

 *	the _received_ ones. The set sets the _sent_ ones.

 */



static int do_ip_getsockopt(struct sock *sk, int level, int optname,
@@ -1143,7 +1146,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname, 
			return -EFAULT;

		}

		err = ip_mc_gsfget(sk, &gsf,

				   (struct group_filter __user *)optval, optlen);

				   (struct group_filter __user *)optval,

				   optlen);

		release_sock(sk);

		return err;

	}
@@ -1230,6 +1234,7 @@ int ip_getsockopt(struct sock *sk, int level, 
#endif

	return err;

}

EXPORT_SYMBOL(ip_getsockopt);



#ifdef CONFIG_COMPAT

int compat_ip_getsockopt(struct sock *sk, int level, int optname,
@@ -1262,11 +1267,5 @@ int compat_ip_getsockopt(struct sock *sk, int level, int optname, 
#endif

	return err;

}



EXPORT_SYMBOL(compat_ip_getsockopt);

#endif
 


EXPORT_SYMBOL(ip_cmsg_recv);



EXPORT_SYMBOL(ip_getsockopt);

EXPORT_SYMBOL(ip_setsockopt);