On Tue, 21 Oct 2003 10:29:39 -0700 Brian Buesker <bbuesker@qualcomm.com> wrote: > In 2.6.0-test8 (and older versions), is there a reason why > _decode_session6 does not set fl->proto at all? That is definitely a bug, here is the fix I'm putting into my tree. # This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1359 -> 1.1360 # net/ipv6/xfrm6_policy.c 1.12 -> 1.13 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/10/22 davem@nuts.ninka.net 1.1360 # [IPV6]: Set fl->proto in _decode_sesseion6. # -------------------------------------------- # diff -Nru a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c --- a/net/ipv6/xfrm6_policy.c Wed Oct 22 02:23:18 2003 +++ b/net/ipv6/xfrm6_policy.c Wed Oct 22 02:23:18 2003 @@ -219,6 +219,7 @@ fl->fl_ip_sport = ports[0]; fl->fl_ip_dport = ports[1]; } + fl->proto = nexthdr; return; /* XXX Why are there these headers? */ @@ -227,6 +228,7 @@ case IPPROTO_COMP: default: fl->fl_ipsec_spi = 0; + fl->proto = nexthdr; return; }; } - : send the line "unsubscribe linux-net" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
