summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGUO Zihua <guozihua@huawei.com>2022-09-02 09:54:07 +0200
committerJakub Kicinski <kuba@kernel.org>2022-09-03 06:18:43 +0200
commit12f7bd252221d4f9e000e20530e50129241e3a67 (patch)
tree4582fb85a628728901539e689bef43b4f67d5cf0
parentnet: ieee802154: Fix compilation error when CONFIG_IEEE802154_NL802154_EXPERI... (diff)
downloadlinux-12f7bd252221d4f9e000e20530e50129241e3a67.tar.xz
linux-12f7bd252221d4f9e000e20530e50129241e3a67.zip
net: broadcom: Fix return type for implementation of
Since Linux now supports CFI, it will be a good idea to fix mismatched return type for implementation of hooks. Otherwise this might get cought out by CFI and cause a panic. bcm4908_enet_start_xmit() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so change the return type to netdev_tx_t directly. Signed-off-by: GUO Zihua <guozihua@huawei.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Link: https://lore.kernel.org/r/20220902075407.52358-1-guozihua@huawei.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--drivers/net/ethernet/broadcom/bcm4908_enet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c
index c131d8118489..e5e17a182f9d 100644
--- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
@@ -507,7 +507,7 @@ static int bcm4908_enet_stop(struct net_device *netdev)
return 0;
}
-static int bcm4908_enet_start_xmit(struct sk_buff *skb, struct net_device *netdev)
+static netdev_tx_t bcm4908_enet_start_xmit(struct sk_buff *skb, struct net_device *netdev)
{
struct bcm4908_enet *enet = netdev_priv(netdev);
struct bcm4908_enet_dma_ring *ring = &enet->tx_ring;