| Message ID | 1376916431-8249-1-git-send-email-ramirose@gmail.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
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! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);
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(-)