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

Commit 28448b80 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

net: Split sk_no_check into sk_no_check_{rx,tx} 



Define separate fields in the sock structure for configuring disabling
checksums in both TX and RX-- sk_no_check_tx and sk_no_check_rx.
The SO_NO_CHECK socket option only affects sk_no_check_tx. Also,
removed UDP_CSUM_* defines since they are no longer necessary.

Signed-off-by: default avatarTom Herbert <therbert@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b26ba202

drivers/scsi/iscsi_tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ iscsi_sw_tcp_conn_restore_callbacks(struct iscsi_conn *conn) 
	sk->sk_data_ready   = tcp_sw_conn->old_data_ready;

	sk->sk_state_change = tcp_sw_conn->old_state_change;

	sk->sk_write_space  = tcp_sw_conn->old_write_space;

	sk->sk_no_check	 = 0;

	sk->sk_no_check_tx = 0;

	write_unlock_bh(&sk->sk_callback_lock);

}

include/net/sock.h

+4 −2
Original line number Diff line number Diff line
@@ -243,7 +243,8 @@ struct cg_proto; 
  *	@sk_sndbuf: size of send buffer in bytes

  *	@sk_flags: %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE,

  *		   %SO_OOBINLINE settings, %SO_TIMESTAMPING settings

  *	@sk_no_check: %SO_NO_CHECK setting, whether or not checkup packets

  *	@sk_no_check_tx: %SO_NO_CHECK setting, set checksum in TX packets

  *	@sk_no_check_rx: allow zero checksum in RX packets

  *	@sk_route_caps: route capabilities (e.g. %NETIF_F_TSO)

  *	@sk_route_nocaps: forbidden route capabilities (e.g NETIF_F_GSO_MASK)

  *	@sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4)
@@ -371,7 +372,8 @@ struct sock { 
	struct sk_buff_head	sk_write_queue;

	kmemcheck_bitfield_begin(flags);

	unsigned int		sk_shutdown  : 2,

				sk_no_check  : 2,

				sk_no_check_tx : 1,

				sk_no_check_rx : 1,

				sk_userlocks : 4,

				sk_protocol  : 8,

				sk_type      : 16;

include/net/udp.h

+0 −9
Original line number Diff line number Diff line
@@ -95,15 +95,6 @@ static inline struct udp_hslot *udp_hashslot2(struct udp_table *table, 
	return &table->hash2[hash & table->mask];

}



/* Note: this must match 'valbool' in sock_setsockopt */

#define UDP_CSUM_NOXMIT		1



/* Used by SunRPC/xprt layer. */

#define UDP_CSUM_NORCV		2



/* Default, as per the RFC, is to always do csums. */

#define UDP_CSUM_DEFAULT	0



extern struct proto udp_prot;



extern atomic_long_t udp_memory_allocated;

net/appletalk/ddp.c

+1 −1
Original line number Diff line number Diff line
@@ -1669,7 +1669,7 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr 
		goto out;

	}



	if (sk->sk_no_check == 1)

	if (sk->sk_no_check_tx)

		ddp->deh_sum = 0;

	else

		ddp->deh_sum = atalk_checksum(skb, len + sizeof(*ddp));

net/core/sock.c

+2 −2
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ set_rcvbuf: 
		break;



	case SO_NO_CHECK:

		sk->sk_no_check = valbool;

		sk->sk_no_check_tx = valbool;

		break;



	case SO_PRIORITY:
@@ -1064,7 +1064,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, 
		break;



	case SO_NO_CHECK:

		v.val = sk->sk_no_check;

		v.val = sk->sk_no_check_tx;

		break;



	case SO_PRIORITY: