diff options
| author | Tom Herbert <therbert@google.com> | 2014-10-03 15:48:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-03 16:53:32 -0700 |
| commit | efc98d08e1ec4fd131f794370b274dceaf32c958 (patch) | |
| tree | 59358c5df14d19067e5562d0d37c272156b0c221 /net/ipv4/udp_offload.c | |
| parent | 7371e0221c7721a1486fef745abaa8ae84571621 (diff) | |
| download | linux-efc98d08e1ec4fd131f794370b274dceaf32c958.tar.gz linux-efc98d08e1ec4fd131f794370b274dceaf32c958.tar.xz | |
fou: eliminate IPv4,v6 specific GRO functions
This patch removes fou[46]_gro_receive and fou[46]_gro_complete
functions. The v4 or v6 variants were chosen for the UDP offloads
based on the address family of the socket this is not necessary
or correct. Alternatively, this patch adds is_ipv6 to napi_gro_skb.
This is set in udp6_gro_receive and unset in udp4_gro_receive. In
fou_gro_receive the value is used to select the correct inet_offloads
for the protocol of the outer IP header.
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udp_offload.c')
| -rw-r--r-- | net/ipv4/udp_offload.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index 8c35f2c939ee..507310ef4b56 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -334,6 +334,7 @@ static struct sk_buff **udp4_gro_receive(struct sk_buff **head, skb_gro_checksum_try_convert(skb, IPPROTO_UDP, uh->check, inet_gro_compute_pseudo); skip: + NAPI_GRO_CB(skb)->is_ipv6 = 0; return udp_gro_receive(head, skb, uh); flush: |