[NET] core: whitespace cleanup (e71a4783) · Commits · 戴 / test

net/core/sock.c

+354 −358

Original line number	Diff line number	Diff line
		@@ -362,7 +362,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
		#endif

		if (optlen < sizeof(int))
		return(-EINVAL);
		return -EINVAL;

		if (get_user(val, (int __user *)optval))
		return -EFAULT;
		@@ -371,11 +371,9 @@ int sock_setsockopt(struct socket *sock, int level, int optname,

		lock_sock(sk);

		switch(optname)
		{
		switch(optname) {
		case SO_DEBUG:
		if(val && !capable(CAP_NET_ADMIN))
		{
		if (val && !capable(CAP_NET_ADMIN)) {
		ret = -EACCES;
		}
		else if (valbool)
		@@ -641,8 +639,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
		{
		struct sock *sk = sock->sk;

		union
		{
		union {
		int val;
		struct linger ling;
		struct timeval tm;
		@@ -656,8 +653,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
		if (len < 0)
		return -EINVAL;

		switch(optname)
		{
		switch(optname) {
		case SO_DEBUG:
		v.val = sock_flag(sk, SOCK_DBG);
		break;
		@@ -791,8 +787,9 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
		return security_socket_getpeersec_stream(sock, optval, optlen, len);

		default:
		return(-ENOPROTOOPT);
		return -ENOPROTOOPT;
		}

		if (len > lv)
		len = lv;
		if (copy_to_user(optval, &v, len))
		@@ -1482,8 +1479,7 @@ void sock_init_data(struct socket sock, struct sock sk)

		sock_set_flag(sk, SOCK_ZAPPED);

		if(sock)
		{
		if (sock) {
		sk->sk_type = sock->type;
		sk->sk_sleep = &sock->wait;
		sock->sk = sk;

+148 −149

Original line number	Diff line number	Diff line
		@@ -1098,8 +1098,7 @@ int wireless_process_ioctl(struct ifreq *ifr, unsigned int cmd)
		/* A bunch of special cases, then the generic case...
		* Note that 'cmd' is already filtered in dev_ioctl() with
		* (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) */
		switch(cmd)
		{
		switch (cmd) {
		case SIOCGIWSTATS:
		/* Get Wireless Stats */
		return ioctl_standard_call(dev,