Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit caff2a87 authored by Jarod Wilson's avatar Jarod Wilson Committed by David S. Miller
Browse files

ethernet/qlogic: use core min/max MTU checking 



qede: min_mtu 46, max_mtu 9600
- Put define for max in qede.h

qlcnic: min_mtu 68, max_mtu 9600

CC: netdev@vger.kernel.org
CC Dept-GELinuxNICDev@qlogic.com
CC: Yuval Mintz <Yuval.Mintz@qlogic.com>
CC: Ariel Elior <Ariel.Elior@qlogic.com>
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b80f71f5

drivers/net/ethernet/qlogic/qede/qede.h

+3 −2
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ void qede_recycle_rx_bd_ring(struct qede_rx_queue *rxq, struct qede_dev *edev, 


#define QEDE_MIN_PKT_LEN		64

#define QEDE_RX_HDR_SIZE		256

#define QEDE_MAX_JUMBO_PACKET_SIZE	9600

#define	for_each_queue(i) for (i = 0; i < edev->num_queues; i++)



#endif /* _QEDE_H_ */

drivers/net/ethernet/qlogic/qede/qede_ethtool.c

+0 −8
Original line number Diff line number Diff line
@@ -723,19 +723,11 @@ static void qede_update_mtu(struct qede_dev *edev, union qede_reload_args *args) 
}



/* Netdevice NDOs */

#define ETH_MAX_JUMBO_PACKET_SIZE	9600

#define ETH_MIN_PACKET_SIZE		60

int qede_change_mtu(struct net_device *ndev, int new_mtu)

{

	struct qede_dev *edev = netdev_priv(ndev);

	union qede_reload_args args;



	if ((new_mtu > ETH_MAX_JUMBO_PACKET_SIZE) ||

	    ((new_mtu + ETH_HLEN) < ETH_MIN_PACKET_SIZE)) {

		DP_ERR(edev, "Can't support requested MTU size\n");

		return -EINVAL;

	}



	DP_VERBOSE(edev, (NETIF_MSG_IFUP | NETIF_MSG_IFDOWN),

		   "Configuring MTU size of %d\n", new_mtu);

drivers/net/ethernet/qlogic/qede/qede_main.c

+4 −0
Original line number Diff line number Diff line
@@ -2391,6 +2391,10 @@ static void qede_init_ndev(struct qede_dev *edev) 


	ndev->hw_features = hw_features;



	/* MTU range: 46 - 9600 */

	ndev->min_mtu = ETH_ZLEN - ETH_HLEN;

	ndev->max_mtu = QEDE_MAX_JUMBO_PACKET_SIZE;



	/* Set network device HW mac */

	ether_addr_copy(edev->ndev->dev_addr, edev->dev_info.common.hw_mac);

}

drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c

+0 −6
Original line number Diff line number Diff line
@@ -1024,12 +1024,6 @@ int qlcnic_change_mtu(struct net_device *netdev, int mtu) 
	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	int rc = 0;



	if (mtu < P3P_MIN_MTU || mtu > P3P_MAX_MTU) {

		dev_err(&adapter->netdev->dev, "%d bytes < mtu < %d bytes"

			" not supported\n", P3P_MAX_MTU, P3P_MIN_MTU);

		return -EINVAL;

	}



	rc = qlcnic_fw_cmd_set_mtu(adapter, mtu);



	if (!rc)

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+4 −0
Original line number Diff line number Diff line
@@ -2342,6 +2342,10 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter, struct net_device *netdev, 
	netdev->priv_flags |= IFF_UNICAST_FLT;

	netdev->irq = adapter->msix_entries[0].vector;



	/* MTU range: 68 - 9600 */

	netdev->min_mtu = P3P_MIN_MTU;

	netdev->max_mtu = P3P_MAX_MTU;



	err = qlcnic_set_real_num_queues(adapter, adapter->drv_tx_rings,

					 adapter->drv_sds_rings);

	if (err)