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

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
...@@ -489,8 +489,8 @@ struct qed_dev { ...@@ -489,8 +489,8 @@ struct qed_dev {
u32 int_mode; u32 int_mode;
enum qed_coalescing_mode int_coalescing_mode; enum qed_coalescing_mode int_coalescing_mode;
u8 rx_coalesce_usecs; u16 rx_coalesce_usecs;
u8 tx_coalesce_usecs; u16 tx_coalesce_usecs;
/* Start Bar offset of first hwfn */ /* Start Bar offset of first hwfn */
void __iomem *regview; void __iomem *regview;
......
...@@ -430,11 +430,13 @@ static int qede_get_coalesce(struct net_device *dev, ...@@ -430,11 +430,13 @@ static int qede_get_coalesce(struct net_device *dev,
struct ethtool_coalesce *coal) struct ethtool_coalesce *coal)
{ {
struct qede_dev *edev = netdev_priv(dev); struct qede_dev *edev = netdev_priv(dev);
u16 rxc, txc;
memset(coal, 0, sizeof(struct ethtool_coalesce)); memset(coal, 0, sizeof(struct ethtool_coalesce));
edev->ops->common->get_coalesce(edev->cdev, edev->ops->common->get_coalesce(edev->cdev, &rxc, &txc);
(u16 *)&coal->rx_coalesce_usecs,
(u16 *)&coal->tx_coalesce_usecs); coal->rx_coalesce_usecs = rxc;
coal->tx_coalesce_usecs = txc;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment