diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2017-06-28 19:34:15 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2017-06-28 19:34:15 +0200 |
| commit | 9a1d168e1bc2893120bb7c0d9932dd22f97d0b55 (patch) | |
| tree | f7d419f1601419aa0aebda102a6b14bdf7653443 /net/ipv4/af_inet.c | |
| parent | nfsd4: const-ify nfsd4_ops (diff) | |
| parent | Linux 4.12-rc5 (diff) | |
| download | linux-9a1d168e1bc2893120bb7c0d9932dd22f97d0b55.tar.xz linux-9a1d168e1bc2893120bb7c0d9932dd22f97d0b55.zip | |
Merge tag 'v4.12-rc5' into nfsd tree
Update to get f0c3192ceee3 "virtio_net: lower limit on buffer size".
That bug was interfering with my nfsd testing.
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index f3dad1661343..58925b6597de 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1043,7 +1043,7 @@ static struct inet_protosw inetsw_array[] = .type = SOCK_DGRAM, .protocol = IPPROTO_ICMP, .prot = &ping_prot, - .ops = &inet_dgram_ops, + .ops = &inet_sockraw_ops, .flags = INET_PROTOSW_REUSE, }, |