Message ID | 1588241776-35896-1-git-send-email-wangyunjian@huawei.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | [net-next] net: caif: Fix use correct return type for ndo_start_xmit() | expand |
From: wangyunjian <wangyunjian@huawei.com> Date: Thu, 30 Apr 2020 18:16:16 +0800 > From: Yunjian Wang <wangyunjian@huawei.com> > > The method ndo_start_xmit() returns a value of type netdev_tx_t. Fix > the ndo function to use the correct type. > > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> Applied, thank you.
From: wangyunjian <wangyunjian@huawei.com> Date: Thu, 30 Apr 2020 18:16:16 +0800 > From: Yunjian Wang <wangyunjian@huawei.com> > > The method ndo_start_xmit() returns a value of type netdev_tx_t. Fix > the ndo function to use the correct type. > > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> Applied.
diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c index a566289..79b6a04 100644 --- a/net/caif/chnl_net.c +++ b/net/caif/chnl_net.c @@ -211,7 +211,8 @@ static void chnl_flowctrl_cb(struct cflayer *layr, enum caif_ctrlcmd flow, } } -static int chnl_net_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t chnl_net_start_xmit(struct sk_buff *skb, + struct net_device *dev) { struct chnl_net *priv; struct cfpkt *pkt = NULL;