diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-30 00:54:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-30 00:54:02 -0400 |
| commit | 6abdd5f5935fff978f950561f3c5175eb34dad73 (patch) | |
| tree | 6f3ed3a4f4af9e74436ec9355ebf8201357f1c40 /net/ipv6/udplite.c | |
| parent | 0b498a52778368ff501557d68c7b50878ab1701e (diff) | |
| parent | e4e98c460ad38c78498622a164fd5ef09a2dc9cb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All three conflicts were cases of simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/udplite.c')
| -rw-r--r-- | net/ipv6/udplite.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c index 5cf0099b86f7..47d0d2b87106 100644 --- a/net/ipv6/udplite.c +++ b/net/ipv6/udplite.c | |||
| @@ -50,7 +50,6 @@ struct proto udplitev6_prot = { | |||
| 50 | .unhash = udp_lib_unhash, | 50 | .unhash = udp_lib_unhash, |
| 51 | .get_port = udp_v6_get_port, | 51 | .get_port = udp_v6_get_port, |
| 52 | .obj_size = sizeof(struct udp6_sock), | 52 | .obj_size = sizeof(struct udp6_sock), |
| 53 | .slab_flags = SLAB_DESTROY_BY_RCU, | ||
| 54 | .h.udp_table = &udplite_table, | 53 | .h.udp_table = &udplite_table, |
| 55 | #ifdef CONFIG_COMPAT | 54 | #ifdef CONFIG_COMPAT |
| 56 | .compat_setsockopt = compat_udpv6_setsockopt, | 55 | .compat_setsockopt = compat_udpv6_setsockopt, |