[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>

1 files changed, 5 insertions, 5 deletions

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 55affe39b2eb..1e3dfb20b1cf 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -172,7 +172,7 @@ try_again:
 
                 sin6 = (struct sockaddr_in6 *) msg->msg_name;
                 sin6->sin6_family = AF_INET6;
-                sin6->sin6_port = skb->h.uh->source;
+                sin6->sin6_port = udp_hdr(skb)->source;
                 sin6->sin6_flowinfo = 0;
                 sin6->sin6_scope_id = 0;
 
@@ -346,7 +346,7 @@ static int __udp6_lib_mcast_deliver(struct sk_buff *skb, struct in6_addr *saddr,
                            struct in6_addr *daddr, struct hlist_head udptable[])
 {
         struct sock *sk, *sk2;
-        const struct udphdr *uh = skb->h.uh;
+        const struct udphdr *uh = udp_hdr(skb);
         int dif;
 
         read_lock(&udp_hash_lock);
@@ -420,7 +420,7 @@ int __udp6_lib_rcv(struct sk_buff **pskb, struct hlist_head udptable[],
 
         saddr = &ipv6_hdr(skb)->saddr;
         daddr = &ipv6_hdr(skb)->daddr;
-        uh = skb->h.uh;
+        uh = udp_hdr(skb);
 
         ulen = ntohs(uh->len);
         if (ulen > skb->len)
@@ -441,7 +441,7 @@ int __udp6_lib_rcv(struct sk_buff **pskb, struct hlist_head udptable[],
                                 goto short_packet;
                         saddr = &ipv6_hdr(skb)->saddr;
                         daddr = &ipv6_hdr(skb)->daddr;
-                        uh = skb->h.uh;
+                        uh = udp_hdr(skb);
                 }
         }
 
@@ -534,7 +534,7 @@ static int udp_v6_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);