From 998bdc37de6b5b18341ea2868790c7196b8105ce Mon Sep 17 00:00:00 2001 From: Masahide NAKAMURA Date: Fri, 24 Aug 2007 23:33:01 -0700 Subject: [PATCH] --- yaml --- r: 66327 b: refs/heads/master c: 3b26a9a655ee73a87071a9f6a1fdd5311e31d7c9 h: refs/heads/master i: 66325: 8cfae7f5d4c729e4a6cb9e4ff61923d2924bc1f0 66323: 55da47e64633c8c91c7348563522207bb0667737 66319: bb6279330738c0fa830c1aa282d77bc492f81371 v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_forward.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 30ee2d894400..0857136427cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e5dc146173251e7baad9a1f7586d5a009b6d9f9 +refs/heads/master: 3b26a9a655ee73a87071a9f6a1fdd5311e31d7c9 diff --git a/trunk/net/ipv4/ip_forward.c b/trunk/net/ipv4/ip_forward.c index 8c95cf09f87a..afbf938836f5 100644 --- a/trunk/net/ipv4/ip_forward.c +++ b/trunk/net/ipv4/ip_forward.c @@ -105,7 +105,7 @@ int ip_forward(struct sk_buff *skb) * We now generate an ICMP HOST REDIRECT giving the route * we calculated. */ - if (rt->rt_flags&RTCF_DOREDIRECT && !opt->srr) + if (rt->rt_flags&RTCF_DOREDIRECT && !opt->srr && !skb->sp) ip_rt_send_redirect(skb); skb->priority = rt_tos2priority(iph->tos);