mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-22 23:04:43 +00:00
[SK_BUFF]: Introduce ip_hdr(), remove skb->nh.iph
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e023dd6437
commit
eddc9ec53b
132 changed files with 565 additions and 564 deletions
|
@ -238,10 +238,10 @@ static void sctp_v4_from_skb(union sctp_addr *addr, struct sk_buff *skb,
|
|||
sh = (struct sctphdr *) skb->h.raw;
|
||||
if (is_saddr) {
|
||||
*port = sh->source;
|
||||
from = &skb->nh.iph->saddr;
|
||||
from = &ip_hdr(skb)->saddr;
|
||||
} else {
|
||||
*port = sh->dest;
|
||||
from = &skb->nh.iph->daddr;
|
||||
from = &ip_hdr(skb)->daddr;
|
||||
}
|
||||
memcpy(&addr->v4.sin_addr.s_addr, from, sizeof(struct in_addr));
|
||||
}
|
||||
|
@ -530,7 +530,7 @@ static int sctp_v4_skb_iif(const struct sk_buff *skb)
|
|||
/* Was this packet marked by Explicit Congestion Notification? */
|
||||
static int sctp_v4_is_ce(const struct sk_buff *skb)
|
||||
{
|
||||
return INET_ECN_is_ce(skb->nh.iph->tos);
|
||||
return INET_ECN_is_ce(ip_hdr(skb)->tos);
|
||||
}
|
||||
|
||||
/* Create and initialize a new sk for the socket returned by accept(). */
|
||||
|
@ -739,7 +739,7 @@ static void sctp_inet_skb_msgname(struct sk_buff *skb, char *msgname, int *len)
|
|||
sin = (struct sockaddr_in *)msgname;
|
||||
sh = (struct sctphdr *)skb->h.raw;
|
||||
sin->sin_port = sh->source;
|
||||
sin->sin_addr.s_addr = skb->nh.iph->saddr;
|
||||
sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue