---

yaml --- r: 348011 b: refs/heads/master c: 412ed94 h: refs/heads/master i: 348009: 849c0a1 348007: 72f138d v: v3
git-mirror · Dec 21, 2012 · a6affa5 · a6affa5
1 parent dd6ed7c
commit a6affa5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29042073e7af55334ac3c4f2a8340263200c5749
+refs/heads/master: 412ed94744d16806fbec3bd250fd94e71cde5a1f
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
@@ -760,7 +760,10 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
 
 	if (dev->header_ops && dev->type == ARPHRD_IPGRE) {
 		gre_hlen = 0;
-		tiph = (const struct iphdr *)skb->data;
+		if (skb->protocol == htons(ETH_P_IP))
+			tiph = (const struct iphdr *)skb->data;
+		else
+			tiph = &tunnel->parms.iph;
 	} else {
 		gre_hlen = tunnel->hlen;
 		tiph = &tunnel->parms.iph;