diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-06-02 01:14:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-03 05:51:02 -0400 |
commit | 511c3f92ad5b6d9f8f6464be1b4f85f0422be91a (patch) | |
tree | 3e368d9a78f87eb9dd7ff9e57f4aab3f4a96e3b1 /net/ipv4/ipmr.c | |
parent | dfbf97f3ac980b69dfbc41c83a208211a38443e8 (diff) |
net: skb->rtable accessor
Define skb_rtable(const struct sk_buff *skb) accessor to get rtable from skb
Delete skb->rtable field
Setting rtable is not allowed, just set dst instead as rtable is an alias.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 13e9dd3012b3..69dd058283eb 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1354,7 +1354,7 @@ static int ip_mr_forward(struct sk_buff *skb, struct mfc_cache *cache, int local | |||
1354 | if (net->ipv4.vif_table[vif].dev != skb->dev) { | 1354 | if (net->ipv4.vif_table[vif].dev != skb->dev) { |
1355 | int true_vifi; | 1355 | int true_vifi; |
1356 | 1356 | ||
1357 | if (skb->rtable->fl.iif == 0) { | 1357 | if (skb_rtable(skb)->fl.iif == 0) { |
1358 | /* It is our own packet, looped back. | 1358 | /* It is our own packet, looped back. |
1359 | Very complicated situation... | 1359 | Very complicated situation... |
1360 | 1360 | ||
@@ -1430,7 +1430,7 @@ int ip_mr_input(struct sk_buff *skb) | |||
1430 | { | 1430 | { |
1431 | struct mfc_cache *cache; | 1431 | struct mfc_cache *cache; |
1432 | struct net *net = dev_net(skb->dev); | 1432 | struct net *net = dev_net(skb->dev); |
1433 | int local = skb->rtable->rt_flags&RTCF_LOCAL; | 1433 | int local = skb_rtable(skb)->rt_flags & RTCF_LOCAL; |
1434 | 1434 | ||
1435 | /* Packet is looped back after forward, it should not be | 1435 | /* Packet is looped back after forward, it should not be |
1436 | forwarded second time, but still can be delivered locally. | 1436 | forwarded second time, but still can be delivered locally. |
@@ -1646,7 +1646,7 @@ int ipmr_get_route(struct net *net, | |||
1646 | { | 1646 | { |
1647 | int err; | 1647 | int err; |
1648 | struct mfc_cache *cache; | 1648 | struct mfc_cache *cache; |
1649 | struct rtable *rt = skb->rtable; | 1649 | struct rtable *rt = skb_rtable(skb); |
1650 | 1650 | ||
1651 | read_lock(&mrt_lock); | 1651 | read_lock(&mrt_lock); |
1652 | cache = ipmr_cache_find(net, rt->rt_src, rt->rt_dst); | 1652 | cache = ipmr_cache_find(net, rt->rt_src, rt->rt_dst); |