The commit is pushed to "branch-rh7-3.10.0-327.3.1-vz7.10.x-ovz" and will
appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.3.1.el7
------>
commit 695c7a37f707ff7a45321babbf76ea8b5593a6d7
Author: Vladimir Davydov <vdavy...@virtuozzo.com>
Date: Fri Dec 25 12:59:48 2015 +0400
Revert "ms/ipv4: dst_entry leak in ip_send_unicast_reply()"
This reverts commit d3694f250213c27ef7af164f180a457e640bb053
(ms/ipv4: dst_entry leak in ip_send_unicast_reply())
This one has already been backport by RH team. Drop the leftovers.
(rebase to 3.10.0-327.3.1.el7 kernel)
Signed-off-by: Vladimir Davydov <vdavy...@virtuozzo.com>
---
net/ipv4/ip_output.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 95b5307..8b0b9e4 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1515,8 +1515,6 @@ void ip_send_unicast_reply(struct sock *sk, struct
sk_buff *skb,
struct rtable *rt = skb_rtable(skb);
struct net *net = sock_net(sk);
struct sk_buff *nskb;
- struct sock *sk;
- struct inet_sock *inet;
int err;
if (__ip_options_echo(&replyopts.opt.opt, skb, sopt))
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
