diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
| commit | 16e842a62a8ffcc2e51def6ef9fd6e0926539bc5 (patch) | |
| tree | 2cf6c23ab195e68712bca51351c1d37ed950c55d /net/ipv4 | |
| parent | 525352eb6d355bef6adf597252fc6d04f2dbe66c (diff) | |
| parent | 42245e65f356ed54fdf7a1f9a0095e0bc40f73a3 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index a4c347c3b8e3..46f9d9cf7a5f 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
| @@ -618,7 +618,7 @@ static int ipgre_rcv(struct sk_buff *skb) | |||
| 618 | 618 | ||
| 619 | skb->mac.raw = skb->nh.raw; | 619 | skb->mac.raw = skb->nh.raw; |
| 620 | skb->nh.raw = __pskb_pull(skb, offset); | 620 | skb->nh.raw = __pskb_pull(skb, offset); |
| 621 | skb_postpull_rcsum(skb, skb->mac.raw, offset); | 621 | skb_postpull_rcsum(skb, skb->h.raw, offset); |
| 622 | memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options)); | 622 | memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options)); |
| 623 | skb->pkt_type = PACKET_HOST; | 623 | skb->pkt_type = PACKET_HOST; |
| 624 | #ifdef CONFIG_NET_IPGRE_BROADCAST | 624 | #ifdef CONFIG_NET_IPGRE_BROADCAST |