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

2 files changed, 4 insertions, 4 deletions

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;