mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 15:27:29 +00:00
[SK_BUFF]: Introduce udp_hdr(), remove skb->h.uh
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
d9edf9e2be
commit
4bedb45203
12 changed files with 34 additions and 24 deletions
|
@ -420,7 +420,7 @@ static void udp4_hwcsum_outgoing(struct sock *sk, struct sk_buff *skb,
|
|||
__be32 src, __be32 dst, int len )
|
||||
{
|
||||
unsigned int offset;
|
||||
struct udphdr *uh = skb->h.uh;
|
||||
struct udphdr *uh = udp_hdr(skb);
|
||||
__wsum csum = 0;
|
||||
|
||||
if (skb_queue_len(&sk->sk_write_queue) == 1) {
|
||||
|
@ -470,7 +470,7 @@ static int udp_push_pending_frames(struct sock *sk)
|
|||
/*
|
||||
* Create a UDP header
|
||||
*/
|
||||
uh = skb->h.uh;
|
||||
uh = udp_hdr(skb);
|
||||
uh->source = fl->fl_ip_sport;
|
||||
uh->dest = fl->fl_ip_dport;
|
||||
uh->len = htons(up->len);
|
||||
|
@ -866,7 +866,7 @@ try_again:
|
|||
if (sin)
|
||||
{
|
||||
sin->sin_family = AF_INET;
|
||||
sin->sin_port = skb->h.uh->source;
|
||||
sin->sin_port = udp_hdr(skb)->source;
|
||||
sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
|
||||
memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
|
||||
}
|
||||
|
@ -949,7 +949,7 @@ static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb)
|
|||
return 1;
|
||||
|
||||
/* Now we can get the pointers */
|
||||
uh = skb->h.uh;
|
||||
uh = udp_hdr(skb);
|
||||
udpdata = (__u8 *)uh + sizeof(struct udphdr);
|
||||
udpdata32 = (__be32 *)udpdata;
|
||||
|
||||
|
@ -1207,7 +1207,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[],
|
|||
int proto)
|
||||
{
|
||||
struct sock *sk;
|
||||
struct udphdr *uh = skb->h.uh;
|
||||
struct udphdr *uh = udp_hdr(skb);
|
||||
unsigned short ulen;
|
||||
struct rtable *rt = (struct rtable*)skb->dst;
|
||||
__be32 saddr = ip_hdr(skb)->saddr;
|
||||
|
@ -1227,7 +1227,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[],
|
|||
/* UDP validates ulen. */
|
||||
if (ulen < sizeof(*uh) || pskb_trim_rcsum(skb, ulen))
|
||||
goto short_packet;
|
||||
uh = skb->h.uh;
|
||||
uh = udp_hdr(skb);
|
||||
}
|
||||
|
||||
if (udp4_csum_init(skb, uh, proto))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue