From: David S. Miller Date: Mon, 11 Feb 2013 01:14:46 +0000 (-0500) Subject: Merge branch 'gso_type' X-Git-Tag: v3.8~10^2~13 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=839c8cc32bc252345f4d5767d2d6cf695f2124ab;p=users%2Fhch%2Fmisc.git Merge branch 'gso_type' Michael S. Tsirkin says: ==================== At the moment, macvtap crashes are observed if macvtap is attached to an interface with LRO enabled. The crash in question is BUG() in macvtap_skb_to_vnet_hdr. This happens because several drivers set gso_size but not gso_type in incoming skbs. This didn't use to be the case: with intel cards on 3.2 and older kernels, with qlogic - on 3.4 and older kernels, so it's a regression if not a recent one. The following patches fix this for qlogic, broadcom and intel drivers. I tested that the patch fixes the crash for ixgbe but don't have qlogic/broadcom hardware to test. I also only tested TCPv4. Please review, and consider for 3.8. Changes from v1: - added missing htons as suggested by Eric - backported the relevant bits from cbf1de72324a8105ddcc3d9ce9acbc613faea17e for bnx2x ==================== Signed-off-by: David S. Miller --- 839c8cc32bc252345f4d5767d2d6cf695f2124ab