Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11c18b5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents a50e2cc7 a388442c

net/8021q/vlan_dev.c

+3 −0
Original line number Diff line number Diff line
@@ -165,6 +165,9 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, 


	skb_pull(skb, VLAN_HLEN); /* take off the VLAN header (4 bytes currently) */



	/* Need to correct hardware checksum */

	skb_postpull_rcsum(skb, vhdr, VLAN_HLEN);



	/* Ok, lets check to make sure the device (dev) we

	 * came in on is what this VLAN is attached to.

	 */

net/ipv4/ip_gre.c

+1 −1
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ static int ipgre_rcv(struct sk_buff *skb) 


		skb->mac.raw = skb->nh.raw;

		skb->nh.raw = __pskb_pull(skb, offset);

		skb_postpull_rcsum(skb, skb->mac.raw, offset);

		skb_postpull_rcsum(skb, skb->h.raw, offset);

		memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));

		skb->pkt_type = PACKET_HOST;

#ifdef CONFIG_NET_IPGRE_BROADCAST