[SK_BUFF]: Introduce ip_hdr(), remove skb->nh.iph

[safe/jmp/linux-2.6] / net / rxrpc / transport.c

diff --git a/net/rxrpc/transport.c b/net/rxrpc/transport.c
index 8e57be2..cac078b 100644 (file)
--- 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);