From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 22 Oct 2010 04:12:19 +0000 (+0000)
Subject: net: Fix some corner cases in dev_can_checksum()
X-Git-Tag: v2.6.37-rc1~88^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af1905dbec44445d75851996819ac2203670bd0f;p=pandora-kernel.git

net: Fix some corner cases in dev_can_checksum()

dev_can_checksum() incorrectly returns true in these cases:

1. The skb has both out-of-band and in-band VLAN tags and the device
   supports checksum offload for the encapsulated protocol but only with
   one layer of encapsulation.
2. The skb has a VLAN tag and the device supports generic checksumming
   but not in conjunction with VLAN encapsulation.

Rearrange the VLAN tag checks to avoid these.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed