diff options
Diffstat (limited to 'net/ipv4/icmp.c')
-rw-r--r-- | net/ipv4/icmp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index cee77d606fbe..ff9a8e643fcc 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
@@ -381,7 +381,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param, | |||
381 | static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) | 381 | static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) |
382 | { | 382 | { |
383 | struct ipcm_cookie ipc; | 383 | struct ipcm_cookie ipc; |
384 | struct rtable *rt = (struct rtable *)skb->dst; | 384 | struct rtable *rt = skb->rtable; |
385 | struct net *net = rt->u.dst.dev->nd_net; | 385 | struct net *net = rt->u.dst.dev->nd_net; |
386 | struct sock *sk = icmp_sk(net); | 386 | struct sock *sk = icmp_sk(net); |
387 | struct inet_sock *inet = inet_sk(sk); | 387 | struct inet_sock *inet = inet_sk(sk); |
@@ -438,7 +438,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) | |||
438 | struct iphdr *iph; | 438 | struct iphdr *iph; |
439 | int room; | 439 | int room; |
440 | struct icmp_bxm icmp_param; | 440 | struct icmp_bxm icmp_param; |
441 | struct rtable *rt = (struct rtable *)skb_in->dst; | 441 | struct rtable *rt = skb_in->rtable; |
442 | struct ipcm_cookie ipc; | 442 | struct ipcm_cookie ipc; |
443 | __be32 saddr; | 443 | __be32 saddr; |
444 | u8 tos; | 444 | u8 tos; |
@@ -616,7 +616,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) | |||
616 | RT_TOS(tos), rt2->u.dst.dev); | 616 | RT_TOS(tos), rt2->u.dst.dev); |
617 | 617 | ||
618 | dst_release(&rt2->u.dst); | 618 | dst_release(&rt2->u.dst); |
619 | rt2 = (struct rtable *)skb_in->dst; | 619 | rt2 = skb_in->rtable; |
620 | skb_in->dst = odst; | 620 | skb_in->dst = odst; |
621 | } | 621 | } |
622 | 622 | ||
@@ -943,7 +943,7 @@ static void icmp_address(struct sk_buff *skb) | |||
943 | 943 | ||
944 | static void icmp_address_reply(struct sk_buff *skb) | 944 | static void icmp_address_reply(struct sk_buff *skb) |
945 | { | 945 | { |
946 | struct rtable *rt = (struct rtable *)skb->dst; | 946 | struct rtable *rt = skb->rtable; |
947 | struct net_device *dev = skb->dev; | 947 | struct net_device *dev = skb->dev; |
948 | struct in_device *in_dev; | 948 | struct in_device *in_dev; |
949 | struct in_ifaddr *ifa; | 949 | struct in_ifaddr *ifa; |
@@ -988,7 +988,7 @@ static void icmp_discard(struct sk_buff *skb) | |||
988 | int icmp_rcv(struct sk_buff *skb) | 988 | int icmp_rcv(struct sk_buff *skb) |
989 | { | 989 | { |
990 | struct icmphdr *icmph; | 990 | struct icmphdr *icmph; |
991 | struct rtable *rt = (struct rtable *)skb->dst; | 991 | struct rtable *rt = skb->rtable; |
992 | 992 | ||
993 | if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) { | 993 | if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) { |
994 | int nh; | 994 | int nh; |