diff options
-rw-r--r-- | net/ipv6/Makefile | 4 | ||||
-rw-r--r-- | net/ipv6/udp_ipv6.c (renamed from net/ipv6/udp.c) | 0 | ||||
-rw-r--r-- | net/ipv6/udplite_ipv6.c (renamed from net/ipv6/udplite.c) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile index 81969479955f..107051f7c227 100644 --- a/net/ipv6/Makefile +++ b/net/ipv6/Makefile | |||
@@ -6,7 +6,7 @@ obj-$(CONFIG_IPV6) += ipv6.o | |||
6 | 6 | ||
7 | ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \ | 7 | ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \ |
8 | addrlabel.o \ | 8 | addrlabel.o \ |
9 | route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o \ | 9 | route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp_ipv6.o \ |
10 | raw.o protocol.o icmp.o mcast.o reassembly.o tcp_ipv6.o \ | 10 | raw.o protocol.o icmp.o mcast.o reassembly.o tcp_ipv6.o \ |
11 | exthdrs.o datagram.o ip6_flowlabel.o inet6_connection_sock.o | 11 | exthdrs.o datagram.o ip6_flowlabel.o inet6_connection_sock.o |
12 | 12 | ||
@@ -17,7 +17,7 @@ ipv6-$(CONFIG_NETFILTER) += netfilter.o | |||
17 | ipv6-$(CONFIG_IPV6_MULTIPLE_TABLES) += fib6_rules.o | 17 | ipv6-$(CONFIG_IPV6_MULTIPLE_TABLES) += fib6_rules.o |
18 | ipv6-$(CONFIG_PROC_FS) += proc.o | 18 | ipv6-$(CONFIG_PROC_FS) += proc.o |
19 | ipv6-$(CONFIG_SYN_COOKIES) += syncookies.o | 19 | ipv6-$(CONFIG_SYN_COOKIES) += syncookies.o |
20 | ipv6-$(CONFIG_IP_UDPLITE) += udplite.o | 20 | ipv6-$(CONFIG_IP_UDPLITE) += udplite_ipv6.o |
21 | 21 | ||
22 | ipv6-objs += $(ipv6-y) | 22 | ipv6-objs += $(ipv6-y) |
23 | 23 | ||
diff --git a/net/ipv6/udp.c b/net/ipv6/udp_ipv6.c index 55feac7ba717..55feac7ba717 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp_ipv6.c | |||
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite_ipv6.c index 87d4202522ee..87d4202522ee 100644 --- a/net/ipv6/udplite.c +++ b/net/ipv6/udplite_ipv6.c | |||