ipv6: Not need to get address prefix
Subsystems (3)
PATCH 1/1 ipv6: Not need to get address prefix
From: Li RongQing <[email protected]>
Since addrconf_get_prefix_route and rt6_get_route_info input the address prefix to fib6_locate, which does not uses the data which is out of the prefix_len length, so do not need to use ipv6_addr_prefix to get address prefix for them.
Signed-off-by Li RongQing <[email protected]>
--- net/ipv6/addrconf.c | 5 +---- net/ipv6/route.c | 17 +++-------------- 2 files changed, 4 insertions(+), 18 deletions(-)
net/ipv6/addrconf.c +1 -4
@@ -988,12 +988,9 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)* --yoshfuji */ if ((ifp->flags &IFA_F_PERMANENT ) && onlink <1 ) { -struct in6_addr prefix;struct rt6_info *rt; -ipv6_addr_prefix (&prefix, &ifp->addr, ifp->prefix_len); - - rt =addrconf_get_prefix_route (&prefix, + rt =addrconf_get_prefix_route (&ifp->addr, ifp->prefix_len, ifp->idev->dev,0 ,RTF_GATEWAY |RTF_DEFAULT );
net/ipv6/route.c +3 -14
@@ -694,7 +694,6 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len, {struct net *net =dev_net (dev);struct route_info *rinfo = (struct route_info *) opt; -struct in6_addr prefix_buf, *prefix;unsigned int pref;unsigned long lifetime;struct rt6_info *rt;
@@ -724,20 +723,10 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len, lifetime =addrconf_timeout_fixup (ntohl (rinfo->lifetime),HZ ); -if (rinfo->length ==3 ) - prefix = (struct in6_addr *)rinfo->prefix; -else { -/* this function is safe */ -ipv6_addr_prefix (&prefix_buf, - (struct in6_addr *)rinfo->prefix, - rinfo->prefix_len); - prefix = &prefix_buf; - } -if (rinfo->prefix_len ==0 ) rt =rt6_get_dflt_router (gwaddr, dev);else - rt =rt6_get_route_info (net, prefix, rinfo->prefix_len, + rt =rt6_get_route_info (net, rinfo->prefix, rinfo->prefix_len, gwaddr, dev->ifindex);if (rt && !lifetime) {
@@ -746,8 +735,8 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len, }if (!rt && lifetime) - rt =rt6_add_route_info (net, prefix, rinfo->prefix_len, gwaddr, dev->ifindex, - pref); + rt =rt6_add_route_info (net, rinfo->prefix, rinfo->prefix_len, + gwaddr, dev->ifindex, pref);else if (rt) rt->rt6i_flags =RTF_ROUTEINFO | (rt->rt6i_flags & ~RTF_PREF_MASK ) |RTF_PREF (pref);
Signature · 1 line
1.7.10.4
net/ipv6/route.c int rt6_route_rcv(struct net_device *dev, u8 *opt, int len, · line 739
Quoted 3 lines · On Fri, Dec 20, 2013 at 1:39 PM, <[email protected]> wrote:
From: Li RongQing <[email protected]>
net/ipv6/route.c +2
-0+ rt =rt6_add_route_info (net, rinfo->prefix, rinfo->prefix_len, + gwaddr, dev->ifindex, pref);
Sorry, Please drop this patch, if rinfo->prefix_len=0 and rinfo->length=1,
rt6_add_route_info maybe broken.
-Roy