pktgen: remove one sparse error

net/core/pktgen.c:2672:43: warning: incorrect type in assignment (different base types)
net/core/pktgen.c:2672:43:    expected unsigned short [unsigned] [short] [usertype] <noident>
net/core/pktgen.c:2672:43:    got restricted __be16 [usertype] protocol

Let's use proper struct ethhdr instead of hard coding everything.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 676550f34560eab055e82d68d6ca0555fb431c93..d93cbc5715f45bef064b398a6f47ae7828610cec 100644 (file)
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2645,9 +2645,9 @@ static int process_ipsec(struct pktgen_dev *pkt_dev,
                struct xfrm_state *x = pkt_dev->flows[pkt_dev->curfl].x;
                int nhead = 0;
                if (x) {
-                       int ret;
-                       __u8 *eth;
+                       struct ethhdr *eth;
                        struct iphdr *iph;
+                       int ret;
 
                        nhead = x->props.header_len - skb_headroom(skb);
                        if (nhead > 0) {
@@ -2667,9 +2667,9 @@ static int process_ipsec(struct pktgen_dev *pkt_dev,
                                goto err;
                        }
                        /* restore ll */
-                       eth = (__u8 *) skb_push(skb, ETH_HLEN);
-                       memcpy(eth, pkt_dev->hh, 12);
-                       *(u16 *) &eth[12] = protocol;
+                       eth = (struct ethhdr *)skb_push(skb, ETH_HLEN);
+                       memcpy(eth, pkt_dev->hh, 2 * ETH_ALEN);
+                       eth->h_proto = protocol;
 
                        /* Update IPv4 header len as well as checksum value */
                        iph = ip_hdr(skb);