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

Commit c973f24d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qed-static-checker' 



Sudarsana Reddy Kalluru says:

====================
qed*: Fix the static checker warnings.

The patch series addresses the static checker warnings introduced by the
earlier patches related to qed/qede coalesce configuration support.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fb773e97 d2890dea

drivers/net/ethernet/qlogic/qed/qed.h

+2 −2
Original line number Diff line number Diff line
@@ -489,8 +489,8 @@ struct qed_dev { 


	u32				int_mode;

	enum qed_coalescing_mode	int_coalescing_mode;

	u8				rx_coalesce_usecs;

	u8				tx_coalesce_usecs;

	u16				rx_coalesce_usecs;

	u16				tx_coalesce_usecs;



	/* Start Bar offset of first hwfn */

	void __iomem			*regview;

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

+5 −3
Original line number Diff line number Diff line
@@ -430,11 +430,13 @@ static int qede_get_coalesce(struct net_device *dev, 
			     struct ethtool_coalesce *coal)

{

	struct qede_dev *edev = netdev_priv(dev);

	u16 rxc, txc;



	memset(coal, 0, sizeof(struct ethtool_coalesce));

	edev->ops->common->get_coalesce(edev->cdev,

					(u16 *)&coal->rx_coalesce_usecs,

					(u16 *)&coal->tx_coalesce_usecs);

	edev->ops->common->get_coalesce(edev->cdev, &rxc, &txc);



	coal->rx_coalesce_usecs = rxc;

	coal->tx_coalesce_usecs = txc;



	return 0;

}