Commit 345056af authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller

sfc: Set ip_summed correctly for page buffers passed to GRO

Page buffers containing packets with an incorrect checksum or using a
protocol not handled by hardware checksum offload were previously not
passed to LRO.  The conversion to GRO changed this, but did not set
the ip_summed value accordingly.
Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0549382
...@@ -444,7 +444,8 @@ static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue, ...@@ -444,7 +444,8 @@ static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,
* the appropriate LRO method * the appropriate LRO method
*/ */
static void efx_rx_packet_lro(struct efx_channel *channel, static void efx_rx_packet_lro(struct efx_channel *channel,
struct efx_rx_buffer *rx_buf) struct efx_rx_buffer *rx_buf,
bool checksummed)
{ {
struct napi_struct *napi = &channel->napi_str; struct napi_struct *napi = &channel->napi_str;
...@@ -466,7 +467,8 @@ static void efx_rx_packet_lro(struct efx_channel *channel, ...@@ -466,7 +467,8 @@ static void efx_rx_packet_lro(struct efx_channel *channel,
skb->len = rx_buf->len; skb->len = rx_buf->len;
skb->data_len = rx_buf->len; skb->data_len = rx_buf->len;
skb->truesize += rx_buf->len; skb->truesize += rx_buf->len;
skb->ip_summed = CHECKSUM_UNNECESSARY; skb->ip_summed =
checksummed ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE;
napi_gro_frags(napi); napi_gro_frags(napi);
...@@ -475,6 +477,7 @@ static void efx_rx_packet_lro(struct efx_channel *channel, ...@@ -475,6 +477,7 @@ static void efx_rx_packet_lro(struct efx_channel *channel,
rx_buf->page = NULL; rx_buf->page = NULL;
} else { } else {
EFX_BUG_ON_PARANOID(!rx_buf->skb); EFX_BUG_ON_PARANOID(!rx_buf->skb);
EFX_BUG_ON_PARANOID(!checksummed);
napi_gro_receive(napi, rx_buf->skb); napi_gro_receive(napi, rx_buf->skb);
rx_buf->skb = NULL; rx_buf->skb = NULL;
...@@ -570,7 +573,7 @@ void __efx_rx_packet(struct efx_channel *channel, ...@@ -570,7 +573,7 @@ void __efx_rx_packet(struct efx_channel *channel,
} }
if (likely(checksummed || rx_buf->page)) { if (likely(checksummed || rx_buf->page)) {
efx_rx_packet_lro(channel, rx_buf); efx_rx_packet_lro(channel, rx_buf, checksummed);
goto done; goto done;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment