[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, 2 insertions, 2 deletions

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 44e030eb6e7..c4cec17be33 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -310,7 +310,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
 
         skb_push(skb, sizeof(*iph));
         skb_reset_network_header(skb);
-        iph = skb->nh.iph;
+        iph = ip_hdr(skb);
 
         /* iph->version = 4; iph->ihl = 5; */
         put_unaligned(0x45, (unsigned char *)iph);
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 10d33fc233b..e0faff8eb65 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2391,7 +2391,7 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev,
                 VLAN_TAG_SIZE(pkt_dev) - SVLAN_TAG_SIZE(pkt_dev);
         skb->dev = odev;
         skb->pkt_type = PACKET_HOST;
-        skb->nh.iph = iph;
+        skb->nh.raw = (unsigned char *)iph;
         skb->h.uh = udph;
 
         if (pkt_dev->nfrags <= 0)