diff options
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r-- | net/dccp/ipv4.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index d1dd95289b89..a0a36c9e6cce 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, |
@@ -507,14 +507,14 @@ static void dccp_v4_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) | |||
507 | const struct iphdr *rxiph; | 507 | const struct iphdr *rxiph; |
508 | struct sk_buff *skb; | 508 | struct sk_buff *skb; |
509 | struct dst_entry *dst; | 509 | struct dst_entry *dst; |
510 | struct net *net = dev_net(rxskb->dst->dev); | 510 | struct net *net = dev_net(skb_dst(rxskb)->dev); |
511 | struct sock *ctl_sk = net->dccp.v4_ctl_sk; | 511 | struct sock *ctl_sk = net->dccp.v4_ctl_sk; |
512 | 512 | ||
513 | /* Never send a reset in response to a reset. */ | 513 | /* Never send a reset in response to a reset. */ |
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); |
@@ -528,7 +528,7 @@ static void dccp_v4_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) | |||
528 | rxiph = ip_hdr(rxskb); | 528 | rxiph = ip_hdr(rxskb); |
529 | dccp_hdr(skb)->dccph_checksum = dccp_v4_csum_finish(skb, rxiph->saddr, | 529 | dccp_hdr(skb)->dccph_checksum = dccp_v4_csum_finish(skb, rxiph->saddr, |
530 | rxiph->daddr); | 530 | rxiph->daddr); |
531 | skb->dst = dst_clone(dst); | 531 | skb_dst_set(skb, dst_clone(dst)); |
532 | 532 | ||
533 | bh_lock_sock(ctl_sk); | 533 | bh_lock_sock(ctl_sk); |
534 | err = ip_build_and_send_pkt(skb, ctl_sk, | 534 | err = ip_build_and_send_pkt(skb, ctl_sk, |
@@ -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)) { |