Skip to contentSkip to conversation

xfrm: remove irrelevant comment in xfrm_input().

PATCH Applied Rami Rosen 2 participants 2 messages Aug 19, 2013

Subsystems (3)
lore
Share & tools
lore

Rami Rosen

author
#0 lore raw

PATCH 1/1 xfrm: remove irrelevant comment in xfrm_input().

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.

---
 net/xfrm/xfrm_policy.c | 2 --
 1 file changed, 2 deletions(-)
net/xfrm/xfrm_policy.c +0 -2
index d8da6b8..3d65c6e 100644
@@ -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);
Signature · 1 line
1.8.1.4
maintainer Applied
#1 lore raw
Quoted 8 lines · 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.

Applied to ipsec-next, thanks!