Skip to content

L
linux-davinci
Commit 11c18b5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

parents a50e2cc7 a388442c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
net/8021q/vlan_dev.c
View file @ 11c18b5c
...@@ -165,6 +165,9 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, ...@@ -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) */ 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 /* Ok, lets check to make sure the device (dev) we
* came in on is what this VLAN is attached to. * came in on is what this VLAN is attached to.
*/ */
......
net/ipv4/ip_gre.c
View file @ 11c18b5c
...@@ -618,7 +618,7 @@ static int ipgre_rcv(struct sk_buff *skb) ...@@ -618,7 +618,7 @@ static int ipgre_rcv(struct sk_buff *skb)
skb->mac.raw = skb->nh.raw; skb->mac.raw = skb->nh.raw;
skb->nh.raw = __pskb_pull(skb, offset); 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)); memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
#ifdef CONFIG_NET_IPGRE_BROADCAST #ifdef CONFIG_NET_IPGRE_BROADCAST
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment