Updated from Linux LTS 3.10.22 to 3.10.23
This commit is contained in:
@@ -2515,6 +2515,8 @@ static int process_ipsec(struct pktgen_dev *pkt_dev,
|
||||
if (x) {
|
||||
int ret;
|
||||
__u8 *eth;
|
||||
struct iphdr *iph;
|
||||
|
||||
nhead = x->props.header_len - skb_headroom(skb);
|
||||
if (nhead > 0) {
|
||||
ret = pskb_expand_head(skb, nhead, 0, GFP_ATOMIC);
|
||||
@@ -2536,6 +2538,11 @@ static int process_ipsec(struct pktgen_dev *pkt_dev,
|
||||
eth = (__u8 *) skb_push(skb, ETH_HLEN);
|
||||
memcpy(eth, pkt_dev->hh, 12);
|
||||
*(u16 *) ð[12] = protocol;
|
||||
|
||||
/* Update IPv4 header len as well as checksum value */
|
||||
iph = ip_hdr(skb);
|
||||
iph->tot_len = htons(skb->len - ETH_HLEN);
|
||||
ip_send_check(iph);
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
|
||||
Reference in New Issue
Block a user