diff options
| author |   Asbjørn Sloth Tønnesen <asbjorn@asbjorn.st> | 2016-11-07 20:39:25 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-11-09 18:55:36 -0500 |
| commit | 7ff516ffe4ec723aad824d68d8a23751330e8f19 (patch) | |
| tree | 9c88e3acec5a720e1e02edd1c046c8feb4bb9ef6 /net/l2tp/l2tp_netlink.c | |
| parent | net: l2tp: change L2TP_ATTR_UDP_ZERO_CSUM6_{RX, TX} attribute types (diff) | |
| download | linux-dev-7ff516ffe4ec723aad824d68d8a23751330e8f19.tar.xz linux-dev-7ff516ffe4ec723aad824d68d8a23751330e8f19.zip | |
net: l2tp: only set L2TP_ATTR_UDP_CSUM if AF_INET
Only set L2TP_ATTR_UDP_CSUM in l2tp_nl_tunnel_send()
when it's running over IPv4.
This prepares the code to also have IPv6 specific attributes.
Signed-off-by: Asbjoern Sloth Toennesen <asbjorn@asbjorn.st>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp/l2tp_netlink.c')
| -rw-r--r-- | net/l2tp/l2tp_netlink.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index 59aa2d204e4a..2abd100b8395 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c @@ -379,9 +379,14 @@ static int l2tp_nl_tunnel_send(struct sk_buff *skb, u32 portid, u32 seq, int fla switch (tunnel->encap) { case L2TP_ENCAPTYPE_UDP: + switch (sk->sk_family) { + case AF_INET: + if (nla_put_u8(skb, L2TP_ATTR_UDP_CSUM, !sk->sk_no_check_tx)) + goto nla_put_failure; + break; + } 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_tx)) + nla_put_u16(skb, L2TP_ATTR_UDP_DPORT, ntohs(inet->inet_dport))) goto nla_put_failure; /* NOBREAK */ case L2TP_ENCAPTYPE_IP: |