diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-17 15:27:22 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-17 15:27:22 -0500 |
| commit | b4aa9e05a61b845541fa6f5b1d246976922601f0 (patch) | |
| tree | ca94478c3df281ab76a3399f5ba6341ade3f5791 /net/ipv6/udplite.c | |
| parent | 1dc0f3c54ce1df957f99c17b145488fd03eb1a59 (diff) | |
| parent | 4b8fe66300acb2fba8b16d62606e0d30204022fc (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/vhost/vhost.c
Diffstat (limited to 'net/ipv6/udplite.c')
| -rw-r--r-- | net/ipv6/udplite.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c index 5f48fadc27f7..986c4de5292e 100644 --- a/net/ipv6/udplite.c +++ b/net/ipv6/udplite.c | |||
| @@ -55,6 +55,7 @@ struct proto udplitev6_prot = { | |||
| 55 | .compat_setsockopt = compat_udpv6_setsockopt, | 55 | .compat_setsockopt = compat_udpv6_setsockopt, |
| 56 | .compat_getsockopt = compat_udpv6_getsockopt, | 56 | .compat_getsockopt = compat_udpv6_getsockopt, |
| 57 | #endif | 57 | #endif |
| 58 | .clear_sk = sk_prot_clear_portaddr_nulls, | ||
| 58 | }; | 59 | }; |
| 59 | 60 | ||
| 60 | static struct inet_protosw udplite6_protosw = { | 61 | static struct inet_protosw udplite6_protosw = { |