aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/fib_frontend.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-06-28 07:05:27 -0400
committerDavid S. Miller <davem@davemloft.net>2012-06-28 07:05:27 -0400
commit41347dcdd81988b8e60853257b2875285cc17a4e (patch)
tree29ced900bcde5d9afc252d0b10fdfe6d2e18cc66 /net/ipv4/fib_frontend.c
parent35ebf65e851c6d9731abc6362b189858eb59f4d3 (diff)
ipv4: Kill rt->rt_spec_dst, no longer used.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_frontend.c')
-rw-r--r--net/ipv4/fib_frontend.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 451939b60c54..63b11ca54d95 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -218,8 +218,7 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb)
218 * called with rcu_read_lock() 218 * called with rcu_read_lock()
219 */ 219 */
220int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, u8 tos, 220int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, u8 tos,
221 int oif, struct net_device *dev, __be32 *spec_dst, 221 int oif, struct net_device *dev, u32 *itag)
222 u32 *itag)
223{ 222{
224 struct in_device *in_dev; 223 struct in_device *in_dev;
225 struct flowi4 fl4; 224 struct flowi4 fl4;
@@ -258,7 +257,6 @@ int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, u8 tos,
258 if (res.type != RTN_LOCAL || !accept_local) 257 if (res.type != RTN_LOCAL || !accept_local)
259 goto e_inval; 258 goto e_inval;
260 } 259 }
261 *spec_dst = FIB_RES_PREFSRC(net, res);
262 fib_combine_itag(itag, &res); 260 fib_combine_itag(itag, &res);
263 dev_match = false; 261 dev_match = false;
264 262
@@ -287,17 +285,14 @@ int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, u8 tos,
287 285
288 ret = 0; 286 ret = 0;
289 if (fib_lookup(net, &fl4, &res) == 0) { 287 if (fib_lookup(net, &fl4, &res) == 0) {
290 if (res.type == RTN_UNICAST) { 288 if (res.type == RTN_UNICAST)
291 *spec_dst = FIB_RES_PREFSRC(net, res);
292 ret = FIB_RES_NH(res).nh_scope >= RT_SCOPE_HOST; 289 ret = FIB_RES_NH(res).nh_scope >= RT_SCOPE_HOST;
293 }
294 } 290 }
295 return ret; 291 return ret;
296 292
297last_resort: 293last_resort:
298 if (rpf) 294 if (rpf)
299 goto e_rpf; 295 goto e_rpf;
300 *spec_dst = inet_select_addr(dev, 0, RT_SCOPE_UNIVERSE);
301 *itag = 0; 296 *itag = 0;
302 return 0; 297 return 0;
303 298