Skip to content

Commit 4776258

Browse files
DaveWildergregkh
authored andcommitted
ibmveth: Switch order of ibmveth_helper calls.
[ Upstream commit 5ce9ad8 ] ibmveth_rx_csum_helper() must be called after ibmveth_rx_mss_helper() as ibmveth_rx_csum_helper() may alter ip and tcp checksum values. Fixes: 66aa067 ("ibmveth: Support to enable LSO/CSO for Trunk VEA.") Signed-off-by: David Wilder <dwilder@us.ibm.com> Reviewed-by: Thomas Falcon <tlfalcon@linux.ibm.com> Reviewed-by: Cristobal Forno <cris.forno@ibm.com> Reviewed-by: Pradeep Satyanarayana <pradeeps@linux.vnet.ibm.com> Acked-by: Willem de Bruijn <willemb@google.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 213f323 commit 4776258

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

drivers/net/ethernet/ibm/ibmveth.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,16 +1385,16 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
13851385
skb_put(skb, length);
13861386
skb->protocol = eth_type_trans(skb, netdev);
13871387

1388-
if (csum_good) {
1389-
skb->ip_summed = CHECKSUM_UNNECESSARY;
1390-
ibmveth_rx_csum_helper(skb, adapter);
1391-
}
1392-
13931388
if (length > netdev->mtu + ETH_HLEN) {
13941389
ibmveth_rx_mss_helper(skb, mss, lrg_pkt);
13951390
adapter->rx_large_packets++;
13961391
}
13971392

1393+
if (csum_good) {
1394+
skb->ip_summed = CHECKSUM_UNNECESSARY;
1395+
ibmveth_rx_csum_helper(skb, adapter);
1396+
}
1397+
13981398
napi_gro_receive(napi, skb); /* send it up */
13991399

14001400
netdev->stats.rx_packets++;

0 commit comments

Comments
 (0)