]> www.infradead.org Git - users/jedix/linux-maple.git/commit
ipv4: Save nexthop address of LSRR/SSRR option to IPCB.
authorMaxim Uvarov <maxim.uvarov@oracle.com>
Wed, 4 Apr 2012 21:38:26 +0000 (14:38 -0700)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Wed, 4 Apr 2012 21:38:26 +0000 (14:38 -0700)
commit547cb892c033a7b4db6bb58ef6bd500a6a79ddb4
tree7f26675eb70ff8d345a9acbbd755f07cbc759756
parent12e0fa56febd5a825f20498f5b82a0943de4894a
ipv4: Save nexthop address of LSRR/SSRR option to IPCB.

[ Upstream commit ac8a48106be49c422575ddc7531b776f8eb49610 ]

We can not update iph->daddr in ip_options_rcv_srr(), It is too early.
When some exception ocurred later (eg. in ip_forward() when goto
sr_failed) we need the ip header be identical to the original one as
ICMP need it.

Add a field 'nexthop' in struct ip_options to save nexthop of LSRR
or SSRR option.

Signed-off-by: Li Wei <lw@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Conflicts:

net/ipv4/ip_options.c
include/net/inet_sock.h
net/ipv4/ip_forward.c
net/ipv4/ip_options.c