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/dccp/ipv4.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/dccp/ipv4.c')
-rw-r--r-- | net/dccp/ipv4.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index d1dd95289b89..2cf48ba0dbb1 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -452,7 +452,7 @@ static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk, | |||
452 | struct sk_buff *skb) | 452 | struct sk_buff *skb) |
453 | { | 453 | { |
454 | struct rtable *rt; | 454 | struct rtable *rt; |
455 | struct flowi fl = { .oif = skb->rtable->rt_iif, | 455 | struct flowi fl = { .oif = skb_rtable(skb)->rt_iif, |
456 | .nl_u = { .ip4_u = | 456 | .nl_u = { .ip4_u = |
457 | { .daddr = ip_hdr(skb)->saddr, | 457 | { .daddr = ip_hdr(skb)->saddr, |
458 | .saddr = ip_hdr(skb)->daddr, | 458 | .saddr = ip_hdr(skb)->daddr, |
@@ -514,7 +514,7 @@ static void dccp_v4_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) | |||
514 | if (dccp_hdr(rxskb)->dccph_type == DCCP_PKT_RESET) | 514 | if (dccp_hdr(rxskb)->dccph_type == DCCP_PKT_RESET) |
515 | return; | 515 | return; |
516 | 516 | ||
517 | if (rxskb->rtable->rt_type != RTN_LOCAL) | 517 | if (skb_rtable(rxskb)->rt_type != RTN_LOCAL) |
518 | return; | 518 | return; |
519 | 519 | ||
520 | dst = dccp_v4_route_skb(net, ctl_sk, rxskb); | 520 | dst = dccp_v4_route_skb(net, ctl_sk, rxskb); |
@@ -567,7 +567,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) | |||
567 | struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb); | 567 | struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb); |
568 | 568 | ||
569 | /* Never answer to DCCP_PKT_REQUESTs send to broadcast or multicast */ | 569 | /* Never answer to DCCP_PKT_REQUESTs send to broadcast or multicast */ |
570 | if (skb->rtable->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)) | 570 | if (skb_rtable(skb)->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)) |
571 | return 0; /* discard, don't send a reset here */ | 571 | return 0; /* discard, don't send a reset here */ |
572 | 572 | ||
573 | if (dccp_bad_service_code(sk, service)) { | 573 | if (dccp_bad_service_code(sk, service)) { |