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

12 files changed, 34 insertions, 24 deletions

diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index c9abc96a0919..b9f44602c5e1 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -944,9 +944,9 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb)
         /* And provide the already calculated phcs */
         if (ip_hdr(skb)->protocol == IPPROTO_UDP) {
                 flags |= TXFCB_UDP;
-                fcb->phcs = skb->h.uh->check;
+                fcb->phcs = udp_hdr(skb)->check;
         } else
-                fcb->phcs = skb->h.th->check;
+                fcb->phcs = udp_hdr(skb)->check;
 
         /* l3os is the distance between the start of the
          * frame (skb->data) and the start of the IP hdr.
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index d375e786b4b3..ba012e10d79a 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -1422,7 +1422,7 @@ static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 csoff = ETH_HLEN + (ih->ihl << 2);
                 if (proto == IPPROTO_UDP) {
                         csoff += offsetof(struct udphdr, check);
-                        skb->h.uh->check = csum;
+                        udp_hdr(skb)->check = csum;
                 }
                 if (proto == IPPROTO_TCP) {
                         csoff += offsetof(struct tcphdr, check);
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 6b39a268ec29..43723839e934 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1166,7 +1166,7 @@ static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,
                 switch (ip_hdr(skb)->protocol) {
                 case IPPROTO_UDP:
                         cmd_sts |= ETH_UDP_FRAME;
-                        desc->l4i_chk = skb->h.uh->check;
+                        desc->l4i_chk = udp_hdr(skb)->check;
                         break;
                 case IPPROTO_TCP:
                         desc->l4i_chk = skb->h.th->check;
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 0a4a7ac034fa..cb1ac48cc808 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -238,7 +238,6 @@ struct sk_buff {
 
         union {
                 struct tcphdr   *th;
-                struct udphdr   *uh;
                 struct icmphdr  *icmph;
                 struct iphdr    *ipiph;
                 struct ipv6hdr  *ipv6h;
diff --git a/include/linux/udp.h b/include/linux/udp.h
index 7e08c07efe0f..1f58503af9a6 100644
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -26,6 +26,15 @@ struct udphdr {
         __sum16 check;
 };
 
+#ifdef __KERNEL__
+#include <linux/skbuff.h>
+
+static inline struct udphdr *udp_hdr(const struct sk_buff *skb)
+{
+        return (struct udphdr *)skb->h.raw;
+}
+#endif
+
 /* UDP socket options */
 #define UDP_CORK        1       /* Never send partially complete segments */
 #define UDP_ENCAP       100     /* Set the socket to accept encapsulated packets */
diff --git a/include/net/udplite.h b/include/net/udplite.h
index 765032036657..635b0eafca95 100644
--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -101,7 +101,7 @@ static inline int udplite_sender_cscov(struct udp_sock *up, struct udphdr *uh)
 
 static inline __wsum udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb)
 {
-        int cscov = udplite_sender_cscov(udp_sk(sk), skb->h.uh);
+        int cscov = udplite_sender_cscov(udp_sk(sk), udp_hdr(skb));
         __wsum csum = 0;
 
         skb->ip_summed = CHECKSUM_NONE;     /* no HW support for checksumming */
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 8b22723d6436..57a82445c465 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -296,7 +296,9 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
         memcpy(skb->data, msg, len);
         skb->len += len;
 
-        skb->h.uh = udph = (struct udphdr *) skb_push(skb, sizeof(*udph));
+        skb_push(skb, sizeof(*udph));
+        skb_reset_transport_header(skb);
+        udph = udp_hdr(skb);
         udph->source = htons(np->local_port);
         udph->dest = htons(np->remote_port);
         udph->len = htons(udp_len);
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index ee82364c8f31..160d4f01c46e 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2392,7 +2392,7 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev,
         skb->dev = odev;
         skb->pkt_type = PACKET_HOST;
         skb->nh.raw = (unsigned char *)iph;
-        skb->h.uh = udph;
+        skb->h.raw = (unsigned char *)udph;
 
         if (pkt_dev->nfrags <= 0)
                 pgh = (struct pktgen_hdr *)skb_put(skb, datalen);
@@ -2737,7 +2737,7 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev,
         skb->dev = odev;
         skb->pkt_type = PACKET_HOST;
         skb->nh.raw = (unsigned char *)iph;
-        skb->h.uh = udph;
+        skb->h.raw = (unsigned char *)udph;
 
         if (pkt_dev->nfrags <= 0)
                 pgh = (struct pktgen_hdr *)skb_put(skb, datalen);
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 13875e8419a7..926404c5e58c 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -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))
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);
diff --git a/net/rxrpc/connection.c b/net/rxrpc/connection.c
index e601fa87bb77..665a99952440 100644
--- a/net/rxrpc/connection.c
+++ b/net/rxrpc/connection.c
@@ -229,10 +229,10 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
         _enter("%p{{%hu}},%u,%hu",
                peer,
                peer->trans->port,
-               ntohs(pkt->h.uh->source),
+               ntohs(udp_hdr(pkt)->source),
                ntohs(msg->hdr.serviceId));
 
-        x_port          = pkt->h.uh->source;
+        x_port          = udp_hdr(pkt)->source;
         x_epoch         = msg->hdr.epoch;
         x_clflag        = msg->hdr.flags & RXRPC_CLIENT_INITIATED;
         x_connid        = htonl(ntohl(msg->hdr.cid) & RXRPC_CIDMASK);
diff --git a/net/rxrpc/transport.c b/net/rxrpc/transport.c
index cac078b74068..62398fd01f85 100644
--- a/net/rxrpc/transport.c
+++ b/net/rxrpc/transport.c
@@ -479,7 +479,7 @@ void rxrpc_trans_receive_packet(struct rxrpc_transport *trans)
                 }
 
                 addr = ip_hdr(pkt)->saddr;
-                port = pkt->h.uh->source;
+                port = udp_hdr(pkt)->source;
 
                 _net("Rx Received UDP packet from %08x:%04hu",
                      ntohl(addr), ntohs(port));
@@ -625,7 +625,7 @@ int rxrpc_trans_immediate_abort(struct rxrpc_transport *trans,
 
         memset(&sin,0,sizeof(sin));
         sin.sin_family          = AF_INET;
-        sin.sin_port            = msg->pkt->h.uh->source;
+        sin.sin_port            = udp_hdr(msg->pkt)->source;
         sin.sin_addr.s_addr     = ip_hdr(msg->pkt)->saddr;
 
         msghdr.msg_name         = &sin;