Commit ee8b7a11 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net: make drivers set the TSO limit not the GSO limit 



Drivers should call the TSO setting helper, GSO is controllable
by user space.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14d7b812

drivers/net/bonding/bond_main.c

+6 −6
Original line number Diff line number Diff line
@@ -1419,8 +1419,8 @@ static void bond_compute_features(struct bonding *bond) 
	struct list_head *iter;

	struct slave *slave;

	unsigned short max_hard_header_len = ETH_HLEN;

	unsigned int gso_max_size = GSO_MAX_SIZE;

	u16 gso_max_segs = GSO_MAX_SEGS;

	unsigned int tso_max_size = TSO_MAX_SIZE;

	u16 tso_max_segs = TSO_MAX_SEGS;



	if (!bond_has_slaves(bond))

		goto done;
@@ -1449,8 +1449,8 @@ static void bond_compute_features(struct bonding *bond) 
		if (slave->dev->hard_header_len > max_hard_header_len)

			max_hard_header_len = slave->dev->hard_header_len;



		gso_max_size = min(gso_max_size, slave->dev->gso_max_size);

		gso_max_segs = min(gso_max_segs, slave->dev->gso_max_segs);

		tso_max_size = min(tso_max_size, slave->dev->tso_max_size);

		tso_max_segs = min(tso_max_segs, slave->dev->tso_max_segs);

	}

	bond_dev->hard_header_len = max_hard_header_len;
@@ -1463,8 +1463,8 @@ static void bond_compute_features(struct bonding *bond) 
	bond_dev->hw_enc_features |= xfrm_features;

#endif /* CONFIG_XFRM_OFFLOAD */

	bond_dev->mpls_features = mpls_features;

	netif_set_gso_max_segs(bond_dev, gso_max_segs);

	netif_set_gso_max_size(bond_dev, gso_max_size);

	netif_set_tso_max_segs(bond_dev, tso_max_segs);

	netif_set_tso_max_size(bond_dev, tso_max_size);



	bond_dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;

	if ((bond_dev->priv_flags & IFF_XMIT_DST_RELEASE_PERM) &&

drivers/net/ethernet/atheros/atl1e/atl1e_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2395,7 +2395,7 @@ static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	INIT_WORK(&adapter->reset_task, atl1e_reset_task);

	INIT_WORK(&adapter->link_chg_task, atl1e_link_chg_task);

	netif_set_gso_max_size(netdev, MAX_TSO_SEG_SIZE);

	netif_set_tso_max_size(netdev, MAX_TSO_SEG_SIZE);

	err = register_netdev(netdev);

	if (err) {

		netdev_err(netdev, "register netdevice failed\n");

drivers/net/ethernet/cavium/liquidio/lio_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3563,7 +3563,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) 
					      | NETIF_F_TSO | NETIF_F_TSO6

					      | NETIF_F_LRO;

		}

		netif_set_gso_max_size(netdev, OCTNIC_GSO_MAX_SIZE);

		netif_set_tso_max_size(netdev, OCTNIC_GSO_MAX_SIZE);



		/*  Copy of transmit encapsulation capabilities:

		 *  TSO, TSO6, Checksums for this device

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2094,7 +2094,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) 
				      | NETIF_F_TSO | NETIF_F_TSO6

				      | NETIF_F_GRO

				      | NETIF_F_LRO;

		netif_set_gso_max_size(netdev, OCTNIC_GSO_MAX_SIZE);

		netif_set_tso_max_size(netdev, OCTNIC_GSO_MAX_SIZE);



		/* Copy of transmit encapsulation capabilities:

		 * TSO, TSO6, Checksums for this device

drivers/net/ethernet/emulex/benet/be_main.c

+1 −1
Original line number Diff line number Diff line
@@ -5204,7 +5204,7 @@ static void be_netdev_init(struct net_device *netdev) 


	netdev->flags |= IFF_MULTICAST;



	netif_set_gso_max_size(netdev, BE_MAX_GSO_SIZE - ETH_HLEN);

	netif_set_tso_max_size(netdev, BE_MAX_GSO_SIZE - ETH_HLEN);



	netdev->netdev_ops = &be_netdev_ops;