diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-10 14:48:02 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-10 14:48:02 -0500 |
| commit | 68c404b18f6fba404b2753622d0459c68ee128ae (patch) | |
| tree | c1ec0bb12f19d91071b461cc2831d9d3dd4c74f3 /net/ipv6/udp.c | |
| parent | d035c36c58dd9183ad6aa7875dea89893faedb55 (diff) | |
| parent | 6650239a4b01077e80d5a4468562756d77afaa59 (diff) | |
Merge branch 'bugfixes' into nfs-for-2.6.38
Conflicts:
fs/nfs/nfs2xdr.c
fs/nfs/nfs3xdr.c
fs/nfs/nfs4xdr.c
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 91def93bec85..cd6cb7c3e563 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
| @@ -1477,6 +1477,7 @@ struct proto udpv6_prot = { | |||
| 1477 | .compat_setsockopt = compat_udpv6_setsockopt, | 1477 | .compat_setsockopt = compat_udpv6_setsockopt, |
| 1478 | .compat_getsockopt = compat_udpv6_getsockopt, | 1478 | .compat_getsockopt = compat_udpv6_getsockopt, |
| 1479 | #endif | 1479 | #endif |
| 1480 | .clear_sk = sk_prot_clear_portaddr_nulls, | ||
| 1480 | }; | 1481 | }; |
| 1481 | 1482 | ||
| 1482 | static struct inet_protosw udpv6_protosw = { | 1483 | static struct inet_protosw udpv6_protosw = { |