lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 128/222] net: smsc: fix return type of ndo_start_xmit function
    Date
    From: YueHaibing <yuehaibing@huawei.com>

    [ Upstream commit 6323d57f335ce1490d025cacc83fc10b07792130 ]

    The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
    which is a typedef for an enum type, so make sure the implementation in
    this driver has returns 'netdev_tx_t' value, and change the function
    return type to netdev_tx_t.

    Found by coccinelle.

    Signed-off-by: YueHaibing <yuehaibing@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/smsc/smc911x.c | 3 ++-
    drivers/net/ethernet/smsc/smc91x.c | 3 ++-
    drivers/net/ethernet/smsc/smsc911x.c | 3 ++-
    3 files changed, 6 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c
    index cb49c9654f0a7..323b3ac16bc0e 100644
    --- a/drivers/net/ethernet/smsc/smc911x.c
    +++ b/drivers/net/ethernet/smsc/smc911x.c
    @@ -514,7 +514,8 @@ static void smc911x_hardware_send_pkt(struct net_device *dev)
    * now, or set the card to generates an interrupt when ready
    * for the packet.
    */
    -static int smc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
    +static netdev_tx_t
    +smc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
    {
    struct smc911x_local *lp = netdev_priv(dev);
    unsigned int free;
    diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
    index 73212590d04a3..b0c72167badec 100644
    --- a/drivers/net/ethernet/smsc/smc91x.c
    +++ b/drivers/net/ethernet/smsc/smc91x.c
    @@ -637,7 +637,8 @@ done: if (!THROTTLE_TX_PKTS)
    * now, or set the card to generates an interrupt when ready
    * for the packet.
    */
    -static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
    +static netdev_tx_t
    +smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
    {
    struct smc_local *lp = netdev_priv(dev);
    void __iomem *ioaddr = lp->base;
    diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
    index 734caa7a557be..4143659615e10 100644
    --- a/drivers/net/ethernet/smsc/smsc911x.c
    +++ b/drivers/net/ethernet/smsc/smsc911x.c
    @@ -1776,7 +1776,8 @@ static int smsc911x_stop(struct net_device *dev)
    }

    /* Entry point for transmitting a packet */
    -static int smsc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
    +static netdev_tx_t
    +smsc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
    {
    struct smsc911x_data *pdata = netdev_priv(dev);
    unsigned int freespace;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-22 12:22    [W:4.042 / U:0.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site