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>
This commit is contained in:
parent
7f1598678d
commit
d496958145
|
@ -2645,9 +2645,9 @@ static int process_ipsec(struct pktgen_dev *pkt_dev,
|
||||||
struct xfrm_state *x = pkt_dev->flows[pkt_dev->curfl].x;
|
struct xfrm_state *x = pkt_dev->flows[pkt_dev->curfl].x;
|
||||||
int nhead = 0;
|
int nhead = 0;
|
||||||
if (x) {
|
if (x) {
|
||||||
int ret;
|
struct ethhdr *eth;
|
||||||
__u8 *eth;
|
|
||||||
struct iphdr *iph;
|
struct iphdr *iph;
|
||||||
|
int ret;
|
||||||
|
|
||||||
nhead = x->props.header_len - skb_headroom(skb);
|
nhead = x->props.header_len - skb_headroom(skb);
|
||||||
if (nhead > 0) {
|
if (nhead > 0) {
|
||||||
|
@ -2667,9 +2667,9 @@ static int process_ipsec(struct pktgen_dev *pkt_dev,
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
/* restore ll */
|
/* restore ll */
|
||||||
eth = (__u8 *) skb_push(skb, ETH_HLEN);
|
eth = (struct ethhdr *)skb_push(skb, ETH_HLEN);
|
||||||
memcpy(eth, pkt_dev->hh, 12);
|
memcpy(eth, pkt_dev->hh, 2 * ETH_ALEN);
|
||||||
*(u16 *) ð[12] = protocol;
|
eth->h_proto = protocol;
|
||||||
|
|
||||||
/* Update IPv4 header len as well as checksum value */
|
/* Update IPv4 header len as well as checksum value */
|
||||||
iph = ip_hdr(skb);
|
iph = ip_hdr(skb);
|
||||||
|
|
Loading…
Reference in a new issue