[RHEL7,COMMIT] net: Revert "ipv6: Add exports for ip6_vzredir module"

Submitted by Konstantin Khorenko on Dec. 18, 2017, 3:30 p.m.

Details

Message ID 201712181530.vBIFU8O7014509@finist_ce7.work
State New
Series "net: Revert "ipv6: Add exports for ip6_vzredir module""
Headers show

Commit Message

Konstantin Khorenko Dec. 18, 2017, 3:30 p.m.
The commit is pushed to "branch-rh7-3.10.0-693.11.1.vz7.39.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.11.1.vz7.39.7
------>
commit f98b85ed965bfe20c90fc29fc755612416a03c33
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Mon Dec 18 18:30:08 2017 +0300

    net: Revert "ipv6: Add exports for ip6_vzredir module"
    
    This export was needed to ip transparent traffic redirection to, e.g.,
    service VE.
    
    No service VE in Virtuozzo 7 => drop this export.
    No functional changes.
    
    https://jira.sw.ru/browse/PCLIN-28716
    
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
 include/net/ip6_route.h |  1 -
 net/ipv6/route.c        | 10 ++--------
 2 files changed, 2 insertions(+), 9 deletions(-)

Patch hide | download patch | download mbox

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 6c246ecb072b..aff97ee29c57 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -64,7 +64,6 @@  static inline bool rt6_need_strict(const struct in6_addr *daddr)
 
 
 void ip6_route_input(struct sk_buff *skb);
-void __ip6_route_input(struct sk_buff *skb, struct in6_addr *daddr);
 
 struct dst_entry *ip6_route_output(struct net *net, const struct sock *sk,
 				   struct flowi6 *fl6);
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index d0c303ea9e59..24cc989ae327 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1184,7 +1184,7 @@  static struct dst_entry *ip6_route_input_lookup(struct net *net,
 	return fib6_rule_lookup(net, fl6, flags, ip6_pol_route_input);
 }
 
-void __ip6_route_input(struct sk_buff *skb, struct in6_addr *daddr)
+void ip6_route_input(struct sk_buff *skb)
 {
 	const struct ipv6hdr *iph = ipv6_hdr(skb);
 	struct net *net = dev_net(skb->dev);
@@ -1192,7 +1192,7 @@  void __ip6_route_input(struct sk_buff *skb, struct in6_addr *daddr)
 	struct ip_tunnel_info *tun_info;
 	struct flowi6 fl6 = {
 		.flowi6_iif = skb->dev->ifindex,
-		.daddr = *daddr,
+		.daddr = iph->daddr,
 		.saddr = iph->saddr,
 		.flowlabel = ip6_flowinfo(iph),
 		.flowi6_mark = skb->mark,
@@ -1205,12 +1205,6 @@  void __ip6_route_input(struct sk_buff *skb, struct in6_addr *daddr)
 	skb_dst_drop(skb);
 	skb_dst_set(skb, ip6_route_input_lookup(net, skb->dev, &fl6, flags));
 }
-EXPORT_SYMBOL(__ip6_route_input);
-
-void ip6_route_input(struct sk_buff *skb)
-{
-	__ip6_route_input(skb, &ipv6_hdr(skb)->daddr);
-}
 
 static struct rt6_info *ip6_pol_route_output(struct net *net, struct fib6_table *table,
 					     struct flowi6 *fl6, int flags)