]> git.karo-electronics.de Git - karo-tx-linux.git/commit
sfc: Fix assignment of ip_summed for pre-allocated skbs
authorBen Hutchings <bhutchings@solarflare.com>
Fri, 24 Feb 2012 15:12:34 +0000 (15:12 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Mar 2012 16:02:21 +0000 (09:02 -0700)
commit20331103f2dac8436298a2b2cf9f25356a1114a1
tree3f7b75c4f76eaa81b7e009f272edf361d371a4a2
parenta15a4c79ee752e48f928c2aa243c24a9cd8f263c
sfc: Fix assignment of ip_summed for pre-allocated skbs

[ Upstream commit ff3bc1e7527504a93710535611b2f812f3bb89bf ]

When pre-allocating skbs for received packets, we set ip_summed =
CHECKSUM_UNNCESSARY.  We used to change it back to CHECKSUM_NONE when
the received packet had an incorrect checksum or unhandled protocol.

Commit bc8acf2c8c3e43fcc192762a9f964b3e9a17748b ('drivers/net: avoid
some skb->ip_summed initializations') mistakenly replaced the latter
assignment with a DEBUG-only assertion that ip_summed ==
CHECKSUM_NONE.  This assertion is always false, but it seems no-one
has exercised this code path in a DEBUG build.

Fix this by moving our assignment of CHECKSUM_UNNECESSARY into
efx_rx_packet_gro().

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/sfc/rx.c