refresh patches
This commit is contained in:
parent
0503190ffa
commit
962c717e2a
@ -663,7 +663,7 @@
|
|||||||
static inline const void *choose_neigh_daddr(const struct in6_addr *p,
|
static inline const void *choose_neigh_daddr(const struct in6_addr *p,
|
||||||
struct sk_buff *skb,
|
struct sk_buff *skb,
|
||||||
const void *daddr)
|
const void *daddr)
|
||||||
@@ -3873,6 +3876,10 @@ int ip6_route_add(struct fib6_config *cf
|
@@ -3876,6 +3879,10 @@ int ip6_route_add(struct fib6_config *cf
|
||||||
return PTR_ERR(rt);
|
return PTR_ERR(rt);
|
||||||
|
|
||||||
err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack);
|
err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack);
|
||||||
@ -674,7 +674,7 @@
|
|||||||
fib6_info_release(rt);
|
fib6_info_release(rt);
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
@@ -3894,6 +3901,9 @@ static int __ip6_del_rt(struct fib6_info
|
@@ -3897,6 +3904,9 @@ static int __ip6_del_rt(struct fib6_info
|
||||||
err = fib6_del(rt, info);
|
err = fib6_del(rt, info);
|
||||||
spin_unlock_bh(&table->tb6_lock);
|
spin_unlock_bh(&table->tb6_lock);
|
||||||
|
|
||||||
@ -684,7 +684,7 @@
|
|||||||
out:
|
out:
|
||||||
fib6_info_release(rt);
|
fib6_info_release(rt);
|
||||||
return err;
|
return err;
|
||||||
@@ -6356,6 +6366,20 @@ static int ip6_route_dev_notify(struct n
|
@@ -6359,6 +6369,20 @@ static int ip6_route_dev_notify(struct n
|
||||||
return NOTIFY_OK;
|
return NOTIFY_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
|
|||||||
|
|
||||||
--- a/net/ipv6/route.c
|
--- a/net/ipv6/route.c
|
||||||
+++ b/net/ipv6/route.c
|
+++ b/net/ipv6/route.c
|
||||||
@@ -3876,10 +3876,6 @@ int ip6_route_add(struct fib6_config *cf
|
@@ -3879,10 +3879,6 @@ int ip6_route_add(struct fib6_config *cf
|
||||||
return PTR_ERR(rt);
|
return PTR_ERR(rt);
|
||||||
|
|
||||||
err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack);
|
err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack);
|
||||||
@ -26,7 +26,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
|
|||||||
fib6_info_release(rt);
|
fib6_info_release(rt);
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
@@ -3901,9 +3897,6 @@ static int __ip6_del_rt(struct fib6_info
|
@@ -3904,9 +3900,6 @@ static int __ip6_del_rt(struct fib6_info
|
||||||
err = fib6_del(rt, info);
|
err = fib6_del(rt, info);
|
||||||
spin_unlock_bh(&table->tb6_lock);
|
spin_unlock_bh(&table->tb6_lock);
|
||||||
|
|
||||||
@ -36,7 +36,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
|
|||||||
out:
|
out:
|
||||||
fib6_info_release(rt);
|
fib6_info_release(rt);
|
||||||
return err;
|
return err;
|
||||||
@@ -4512,6 +4505,10 @@ int ipv6_route_ioctl(struct net *net, un
|
@@ -4515,6 +4508,10 @@ int ipv6_route_ioctl(struct net *net, un
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
rtnl_unlock();
|
rtnl_unlock();
|
||||||
@ -47,7 +47,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
|
|||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5534,11 +5531,17 @@ static int inet6_rtm_delroute(struct sk_
|
@@ -5537,11 +5534,17 @@ static int inet6_rtm_delroute(struct sk_
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cfg.fc_mp)
|
if (cfg.fc_mp)
|
||||||
@ -67,7 +67,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh,
|
static int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh,
|
||||||
@@ -5555,9 +5558,15 @@ static int inet6_rtm_newroute(struct sk_
|
@@ -5558,9 +5561,15 @@ static int inet6_rtm_newroute(struct sk_
|
||||||
cfg.fc_metric = IP6_RT_PRIO_USER;
|
cfg.fc_metric = IP6_RT_PRIO_USER;
|
||||||
|
|
||||||
if (cfg.fc_mp)
|
if (cfg.fc_mp)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user