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

2 files changed, 3 insertions, 3 deletions

diff --git a/net/rxrpc/connection.c b/net/rxrpc/connection.c
index a7c929a9fdca..e601fa87bb77 100644
--- a/net/rxrpc/connection.c
+++ b/net/rxrpc/connection.c
@@ -267,7 +267,7 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
                 /* fill in the specifics */
                 candidate->addr.sin_family      = AF_INET;
                 candidate->addr.sin_port        = x_port;
-                candidate->addr.sin_addr.s_addr = pkt->nh.iph->saddr;
+                candidate->addr.sin_addr.s_addr = ip_hdr(pkt)->saddr;
                 candidate->in_epoch             = x_epoch;
                 candidate->out_epoch            = x_epoch;
                 candidate->in_clientflag        = RXRPC_CLIENT_INITIATED;
diff --git a/net/rxrpc/transport.c b/net/rxrpc/transport.c
index 8e57be2df936..cac078b74068 100644
--- a/net/rxrpc/transport.c
+++ b/net/rxrpc/transport.c
@@ -478,7 +478,7 @@ void rxrpc_trans_receive_packet(struct rxrpc_transport *trans)
                         return;
                 }
 
-                addr = pkt->nh.iph->saddr;
+                addr = ip_hdr(pkt)->saddr;
                 port = pkt->h.uh->source;
 
                 _net("Rx Received UDP packet from %08x:%04hu",
@@ -626,7 +626,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_addr.s_addr     = msg->pkt->nh.iph->saddr;
+        sin.sin_addr.s_addr     = ip_hdr(msg->pkt)->saddr;
 
         msghdr.msg_name         = &sin;
         msghdr.msg_namelen      = sizeof(sin);