* Re: [ PATCH net-next ] xfrm: remove irrelevant comment in xfrm_input().
2013-08-19 12:47 [ PATCH net-next ] xfrm: remove irrelevant comment in xfrm_input() Rami Rosen
@ 2013-08-19 11:47 ` Steffen Klassert
0 siblings, 0 replies; 2+ messages in thread
From: Steffen Klassert @ 2013-08-19 11:47 UTC (permalink / raw)
To: Rami Rosen; +Cc: davem, netdev
On Mon, Aug 19, 2013 at 03:47:11PM +0300, Rami Rosen wrote:
> This patch removes a comment in xfrm_input() which became irrelevant
> due to commit 2774c13, "xfrm: Handle blackhole route creation via afinfo".
> That commit removed returning -EREMOTE in the xfrm_lookup() method when the
> packet should be discarded and also removed the correspoinding -EREMOTE
> handlers. This was replaced by calling the make_blackhole() method. Therefore
> the comment about -EREMOTE is not relevant anymore.
>
> Signed-off-by: Rami Rosen <ramirose@gmail.com>
Applied to ipsec-next, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
* [ PATCH net-next ] xfrm: remove irrelevant comment in xfrm_input().
@ 2013-08-19 12:47 Rami Rosen
2013-08-19 11:47 ` Steffen Klassert
0 siblings, 1 reply; 2+ messages in thread
From: Rami Rosen @ 2013-08-19 12:47 UTC (permalink / raw)
To: steffen.klassert; +Cc: davem, netdev, Rami Rosen
This patch removes a comment in xfrm_input() which became irrelevant
due to commit 2774c13, "xfrm: Handle blackhole route creation via afinfo".
That commit removed returning -EREMOTE in the xfrm_lookup() method when the
packet should be discarded and also removed the correspoinding -EREMOTE
handlers. This was replaced by calling the make_blackhole() method. Therefore
the comment about -EREMOTE is not relevant anymore.
Signed-off-by: Rami Rosen <ramirose@gmail.com>
---
net/xfrm/xfrm_policy.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index d8da6b8..3d65c6e 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2132,8 +2132,6 @@ restart:
* have the xfrm_state's. We need to wait for KM to
* negotiate new SA's or bail out with error.*/
if (net->xfrm.sysctl_larval_drop) {
- /* EREMOTE tells the caller to generate
- * a one-shot blackhole route. */
dst_release(dst);
xfrm_pols_put(pols, drop_pols);
XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES);
--
1.8.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-19 11:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-19 12:47 [ PATCH net-next ] xfrm: remove irrelevant comment in xfrm_input() Rami Rosen
2013-08-19 11:47 ` Steffen Klassert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).