From: David S. Miller Date: Thu, 25 Jun 2020 04:51:03 +0000 (-0700) Subject: Merge branch 'net-bcmgenet-use-hardware-padding-of-runt-frames' X-Git-Tag: microblaze-v5.10~446^2~15 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=eb2932b00fc75a154bb4607773dc0666924116ad;p=linux-2.6-microblaze.git Merge branch 'net-bcmgenet-use-hardware-padding-of-runt-frames' Doug Berger says: ==================== net: bcmgenet: use hardware padding of runt frames Now that scatter-gather and tx-checksumming are enabled by default it revealed a packet corruption issue that can occur for very short fragmented packets. When padding these frames to the minimum length it is possible for the non-linear (fragment) data to be added to the end of the linear header in an SKB. Since the number of fragments is read before the padding and used afterward without reloading, the fragment that should have been consumed can be tacked on in place of part of the padding. The third commit in this set corrects this by removing the software padding and allowing the hardware to add the pad bytes if necessary. The first two commits resolve warnings observed by the kbuild test robot and are included here for simplicity of application. ==================== Signed-off-by: David S. Miller --- eb2932b00fc75a154bb4607773dc0666924116ad