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: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 3 insertions, 4 deletions

diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index ed0716a075ba..a1186105f537 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -1188,7 +1188,7 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len
                         l2tp_xmit_ipv6_csum(sk, skb, udp_len);
                 else
 #endif
-                if (sk->sk_no_check == UDP_CSUM_NOXMIT)
+                if (sk->sk_no_check_tx)
                         skb->ip_summed = CHECKSUM_NONE;
                 else if ((skb_dst(skb) && skb_dst(skb)->dev) &&
                          (!(skb_dst(skb)->dev->features & NETIF_F_V4_CSUM))) {
@@ -1463,7 +1463,7 @@ static int l2tp_tunnel_sock_create(struct net *net,
                 }
 
                 if (!cfg->use_udp_checksums)
-                        sock->sk->sk_no_check = UDP_CSUM_NOXMIT;
+                        sock->sk->sk_no_check_tx = 1;
 
                 break;
 
diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
index bd7387adea9e..f3d331bdd706 100644
--- a/net/l2tp/l2tp_netlink.c
+++ b/net/l2tp/l2tp_netlink.c
@@ -297,8 +297,7 @@ static int l2tp_nl_tunnel_send(struct sk_buff *skb, u32 portid, u32 seq, int fla
         case L2TP_ENCAPTYPE_UDP:
                 if (nla_put_u16(skb, L2TP_ATTR_UDP_SPORT, ntohs(inet->inet_sport)) ||
                     nla_put_u16(skb, L2TP_ATTR_UDP_DPORT, ntohs(inet->inet_dport)) ||
-                    nla_put_u8(skb, L2TP_ATTR_UDP_CSUM,
-                               (sk->sk_no_check != UDP_CSUM_NOXMIT)))
+                    nla_put_u8(skb, L2TP_ATTR_UDP_CSUM, !sk->sk_no_check_tx))
                         goto nla_put_failure;
                 /* NOBREAK */
         case L2TP_ENCAPTYPE_IP: