| From | Greg Kroah-Hartman <> | Subject | [PATCH 5.12 063/178] net: mhi_net: Update the transmit handler prototype | Date | Mon, 21 Jun 2021 18:14:37 +0200 |
| |
From: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
[ Upstream commit 2214fb53006e6cfa6371b706070cb99794c68c3b ]
Update the function prototype of mhi_ndo_xmit to match ndo_start_xmit. This otherwise leads to run time failures when CFI is enabled in kernel.
Fixes: 3ffec6a14f24 ("net: Add mhi-net driver") Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/net/mhi/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/mhi/net.c b/drivers/net/mhi/net.c index f59960876083..8e7f8728998f 100644 --- a/drivers/net/mhi/net.c +++ b/drivers/net/mhi/net.c @@ -49,7 +49,7 @@ static int mhi_ndo_stop(struct net_device *ndev) return 0; } -static int mhi_ndo_xmit(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t mhi_ndo_xmit(struct sk_buff *skb, struct net_device *ndev) { struct mhi_net_dev *mhi_netdev = netdev_priv(ndev); const struct mhi_net_proto *proto = mhi_netdev->proto; -- 2.30.2
|