diff options
author | Michael Smith <msmith@cbnco.com> | 2011-04-07 00:51:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-10 21:50:59 -0400 |
commit | 5c04c819a20af40adb7d282199f4e34e14fa05c5 (patch) | |
tree | c92925ffcf83d593f8cd52faed144cc43289d7f9 /net/ipv4/route.c | |
parent | 5325e92f33eef5fb54e2e63185d965b4be59a4b3 (diff) |
fib_validate_source(): pass sk_buff instead of mark
This makes sk_buff available for other use in fib_validate_source().
Signed-off-by: Michael Smith <msmith@cbnco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r-- | net/ipv4/route.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 1628be530314..052c9123e576 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -1871,8 +1871,8 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr, | |||
1871 | goto e_inval; | 1871 | goto e_inval; |
1872 | spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK); | 1872 | spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK); |
1873 | } else { | 1873 | } else { |
1874 | err = fib_validate_source(saddr, 0, tos, 0, dev, &spec_dst, | 1874 | err = fib_validate_source(skb, saddr, 0, tos, 0, dev, &spec_dst, |
1875 | &itag, 0); | 1875 | &itag); |
1876 | if (err < 0) | 1876 | if (err < 0) |
1877 | goto e_err; | 1877 | goto e_err; |
1878 | } | 1878 | } |
@@ -1981,8 +1981,8 @@ static int __mkroute_input(struct sk_buff *skb, | |||
1981 | } | 1981 | } |
1982 | 1982 | ||
1983 | 1983 | ||
1984 | err = fib_validate_source(saddr, daddr, tos, FIB_RES_OIF(*res), | 1984 | err = fib_validate_source(skb, saddr, daddr, tos, FIB_RES_OIF(*res), |
1985 | in_dev->dev, &spec_dst, &itag, skb->mark); | 1985 | in_dev->dev, &spec_dst, &itag); |
1986 | if (err < 0) { | 1986 | if (err < 0) { |
1987 | ip_handle_martian_source(in_dev->dev, in_dev, skb, daddr, | 1987 | ip_handle_martian_source(in_dev->dev, in_dev, skb, daddr, |
1988 | saddr); | 1988 | saddr); |
@@ -2150,9 +2150,9 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, | |||
2150 | goto brd_input; | 2150 | goto brd_input; |
2151 | 2151 | ||
2152 | if (res.type == RTN_LOCAL) { | 2152 | if (res.type == RTN_LOCAL) { |
2153 | err = fib_validate_source(saddr, daddr, tos, | 2153 | err = fib_validate_source(skb, saddr, daddr, tos, |
2154 | net->loopback_dev->ifindex, | 2154 | net->loopback_dev->ifindex, |
2155 | dev, &spec_dst, &itag, skb->mark); | 2155 | dev, &spec_dst, &itag); |
2156 | if (err < 0) | 2156 | if (err < 0) |
2157 | goto martian_source_keep_err; | 2157 | goto martian_source_keep_err; |
2158 | if (err) | 2158 | if (err) |
@@ -2176,8 +2176,8 @@ brd_input: | |||
2176 | if (ipv4_is_zeronet(saddr)) | 2176 | if (ipv4_is_zeronet(saddr)) |
2177 | spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK); | 2177 | spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK); |
2178 | else { | 2178 | else { |
2179 | err = fib_validate_source(saddr, 0, tos, 0, dev, &spec_dst, | 2179 | err = fib_validate_source(skb, saddr, 0, tos, 0, dev, &spec_dst, |
2180 | &itag, skb->mark); | 2180 | &itag); |
2181 | if (err < 0) | 2181 | if (err < 0) |
2182 | goto martian_source_keep_err; | 2182 | goto martian_source_keep_err; |
2183 | if (err) | 2183 | if (err) |