aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp/ipv6.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sctp/ipv6.c')
-rw-r--r--net/sctp/ipv6.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 742f9ff42fbf..001be2de0b3c 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -393,10 +393,10 @@ static void sctp_v6_from_skb(union sctp_addr *addr,struct sk_buff *skb,
393 sh = (struct sctphdr *) skb->h.raw; 393 sh = (struct sctphdr *) skb->h.raw;
394 if (is_saddr) { 394 if (is_saddr) {
395 *port = sh->source; 395 *port = sh->source;
396 from = &skb->nh.ipv6h->saddr; 396 from = &ipv6_hdr(skb)->saddr;
397 } else { 397 } else {
398 *port = sh->dest; 398 *port = sh->dest;
399 from = &skb->nh.ipv6h->daddr; 399 from = &ipv6_hdr(skb)->daddr;
400 } 400 }
401 ipv6_addr_copy(&addr->v6.sin6_addr, from); 401 ipv6_addr_copy(&addr->v6.sin6_addr, from);
402} 402}
@@ -698,7 +698,7 @@ static int sctp_v6_skb_iif(const struct sk_buff *skb)
698/* Was this packet marked by Explicit Congestion Notification? */ 698/* Was this packet marked by Explicit Congestion Notification? */
699static int sctp_v6_is_ce(const struct sk_buff *skb) 699static int sctp_v6_is_ce(const struct sk_buff *skb)
700{ 700{
701 return *((__u32 *)(skb->nh.ipv6h)) & htonl(1<<20); 701 return *((__u32 *)(ipv6_hdr(skb))) & htonl(1 << 20);
702} 702}
703 703
704/* Dump the v6 addr to the seq file. */ 704/* Dump the v6 addr to the seq file. */
@@ -777,7 +777,7 @@ static void sctp_inet6_skb_msgname(struct sk_buff *skb, char *msgname,
777 } 777 }
778 778
779 /* Otherwise, just copy the v6 address. */ 779 /* Otherwise, just copy the v6 address. */
780 ipv6_addr_copy(&sin6->sin6_addr, &skb->nh.ipv6h->saddr); 780 ipv6_addr_copy(&sin6->sin6_addr, &ipv6_hdr(skb)->saddr);
781 if (ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LINKLOCAL) { 781 if (ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LINKLOCAL) {
782 struct sctp_ulpevent *ev = sctp_skb2event(skb); 782 struct sctp_ulpevent *ev = sctp_skb2event(skb);
783 sin6->sin6_scope_id = ev->iif; 783 sin6->sin6_scope_id = ev->iif;