From: David S. Miller <davem@davemloft.net>
Date: Mon, 20 Oct 2014 16:38:19 +0000 (-0400)
Subject: Merge branch 'gso_encap_fixes'
X-Git-Tag: v3.18-rc3~17^2~57
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d10845fc85b2e690b5f6425c5ba4df33a073fbc9;p=linux.git

Merge branch 'gso_encap_fixes'

Florian Westphal says:

====================
net: minor gso encapsulation fixes

The following series fixes a minor bug in the gso segmentation handlers
when encapsulation offload is used.

Theoretically this could cause kernel panic when the stack tries
to software-segment such a GRE offload packet, but it looks like there
is only one affected call site (tbf scheduler) and it handles NULL
return value.

I've included a followup patch to add IS_ERR_OR_NULL checks where needed.

While looking into this, I also found that size computation of the individual
segments is incorrect if skb->encapsulation is set.

Please see individual patches for delta vs. v1.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

d10845fc85b2e690b5f6425c5ba4df33a073fbc9