lkml.org 
[lkml]   [2008]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 02/47] b43: Do not return TX_BUSY from op_tx
    2.6.25-stable review patch.  If anyone has any objections, please let us
    know.

    ------------------
    From: Michael Buesch <mb@bu3sch.de>

    Never return TX_BUSY from op_tx. It doesn't make sense to return
    TX_BUSY, if we can not transmit the packet.
    Drop the packet and return TX_OK.
    This will fix the resume hang.

    Upstream commit is
    66193a7cef2239bfd1b9b96e304770facf7a49c7

    Signed-off-by: Michael Buesch <mb@bu3sch.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>


    ---
    drivers/net/wireless/b43/main.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    --- a/drivers/net/wireless/b43/main.c
    +++ b/drivers/net/wireless/b43/main.c
    @@ -2607,7 +2607,7 @@ static int b43_op_tx(struct ieee80211_hw
    int err;

    if (unlikely(!dev))
    - return NETDEV_TX_BUSY;
    + goto drop_packet;

    /* Transmissions on seperate queues can run concurrently. */
    read_lock_irqsave(&wl->tx_lock, flags);
    @@ -2619,7 +2619,12 @@ static int b43_op_tx(struct ieee80211_hw
    read_unlock_irqrestore(&wl->tx_lock, flags);

    if (unlikely(err))
    - return NETDEV_TX_BUSY;
    + goto drop_packet;
    + return NETDEV_TX_OK;
    +
    +drop_packet:
    + /* We can not transmit this packet. Drop it. */
    + dev_kfree_skb_any(skb);
    return NETDEV_TX_OK;
    }

    --


    \
     
     \ /
      Last update: 2008-07-23 01:21    [W:0.020 / U:31.300 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site