3.6.11.2 stable review patch. If anyone has any objections, please let me know.
------------------ From: "Steven Rostedt (Red Hat)" <[email protected]> Commit 1bef9ca32aaed714a204a3eceb856a5000328c5b "IP_GRE: Fix kernel panic in IP_GRE with GRE csum." which was upstream commit d0a7cc630a337b0f56dc145e7eb6232852b14dd4 was added to the 3.6.11.1 by mistake. Ben Hutchings reported to me that this commit fixes a bug introduced by commit 6b78f16e4bdde3936b which was added in the 3.7-rc cycle, and not needed to be back ported to 3.6. I removed it from my queue, but the git repo I used to push still included it. Signed-off-by: Steven Rostedt <[email protected]> --- net/ipv4/ip_gre.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 3ee08ce..b062a98 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -946,12 +946,8 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev ptr--; } if (tunnel->parms.o_flags&GRE_CSUM) { - int offset = skb_transport_offset(skb); - *ptr = 0; - *(__sum16 *)ptr = csum_fold(skb_checksum(skb, offset, - skb->len - offset, - 0)); + *(__sum16 *)ptr = ip_compute_csum((void *)(iph+1), skb->len - sizeof(struct iphdr)); } } -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
