diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2018-11-07 12:38:30 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-07 16:23:04 -0800 |
| commit | bcd1665e3569b0a6f569514f023a41fc7df0b4a3 (patch) | |
| tree | 4e28d9a2711bdfa1069efdfb49350ede0e1d97f7 /net | |
| parent | e20cf8d3f1f763ad28a9cb3b41305b8a8a42653e (diff) | |
| download | linux-stable-bcd1665e3569b0a6f569514f023a41fc7df0b4a3.tar.gz linux-stable-bcd1665e3569b0a6f569514f023a41fc7df0b4a3.tar.bz2 linux-stable-bcd1665e3569b0a6f569514f023a41fc7df0b4a3.zip | |
udp: add support for UDP_GRO cmsg
When UDP GRO is enabled, the UDP_GRO cmsg will carry the ingress
datagram size. User-space can use such info to compute the original
packets layout.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/udp.c | 4 | ||||
| -rw-r--r-- | net/ipv6/udp.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 9fc08b098ced..dddc6fe90f51 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1711,6 +1711,10 @@ try_again: memset(sin->sin_zero, 0, sizeof(sin->sin_zero)); *addr_len = sizeof(*sin); } + + if (udp_sk(sk)->gro_enabled) + udp_cmsg_recv(msg, sk, skb); + if (inet->cmsg_flags) ip_cmsg_recv_offset(msg, sk, skb, sizeof(struct udphdr), off); diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index bdf7e071a63b..4c79dc5329bc 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -417,6 +417,9 @@ try_again: *addr_len = sizeof(*sin6); } + if (udp_sk(sk)->gro_enabled) + udp_cmsg_recv(msg, sk, skb); + if (np->rxopt.all) ip6_datagram_recv_common_ctl(sk, msg, skb); |