diff options
author | David S. Miller <davem@davemloft.net> | 2016-09-12 15:52:44 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-09-12 15:52:44 -0700 |
commit | b20b378d49926b82c0a131492fa8842156e0e8a9 (patch) | |
tree | 7196847eea049a46442b05f99aee1dc571019381 /drivers/net/ethernet/cavium/thunder/nic_main.c | |
parent | net: dsa: bcm_sf2: Get VLAN_PORT_MASK from b53_device (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-dev-b20b378d49926b82c0a131492fa8842156e0e8a9.tar.xz linux-dev-b20b378d49926b82c0a131492fa8842156e0e8a9.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/qlogic/qed/qed_dcbx.c
drivers/net/phy/Kconfig
All conflicts were cases of overlapping commits.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/thunder/nic_main.c')
-rw-r--r-- | drivers/net/ethernet/cavium/thunder/nic_main.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c index 25618d203931..2bbf4cbf08b2 100644 --- a/drivers/net/ethernet/cavium/thunder/nic_main.c +++ b/drivers/net/ethernet/cavium/thunder/nic_main.c @@ -282,9 +282,14 @@ static void nic_set_tx_pkt_pad(struct nicpf *nic, int size) u16 sdevid; u64 lmac_cfg; - /* Max value that can be set is 60 */ - if (size > 60) - size = 60; + /* There is a issue in HW where-in while sending GSO sized + * pkts as part of TSO, if pkt len falls below this size + * NIC will zero PAD packet and also updates IP total length. + * Hence set this value to lessthan min pkt size of MAC+IP+TCP + * headers, BGX will do the padding to transmit 64 byte pkt. + */ + if (size > 52) + size = 52; pci_read_config_word(nic->pdev, PCI_SUBSYSTEM_ID, &sdevid); /* 81xx's RGX has only one LMAC */ |