lkml.org 
[lkml]   [2010]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[21/39] hostap: Revert a toxic part of the conversion to net_device_ops
    2.6.31-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Martin Decky <martin@decky.cz>

    commit e484c16f6212f7f06407382efa4d3ad214b6c589 upstream.

    As the hostap driver was converted to use net_device_ops, a mistake was
    made in hostap_main.c (commit 5ae4efbcd2611562a8b93596be034e63495706a5).
    Originally, the tx_queue_len was set to 0 for every other interface than
    HOSTAP_INTERFACE_MASTER, but the new fragment of code sets tx_queue_len to
    0 only for HOSTAP_INTERFACE_MASTER. The opposite of the previous
    behavior makes the driver to drop all packets in AP mode.

    Change the way 0 is assigned to tx_queue_len according to the original
    logic.

    Signed-off-by: Martin Decky <martin@decky.cz>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/wireless/hostap/hostap_main.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/net/wireless/hostap/hostap_main.c
    +++ b/drivers/net/wireless/hostap/hostap_main.c
    @@ -875,15 +875,16 @@ void hostap_setup_dev(struct net_device

    switch(type) {
    case HOSTAP_INTERFACE_AP:
    + dev->tx_queue_len = 0; /* use main radio device queue */
    dev->netdev_ops = &hostap_mgmt_netdev_ops;
    dev->type = ARPHRD_IEEE80211;
    dev->header_ops = &hostap_80211_ops;
    break;
    case HOSTAP_INTERFACE_MASTER:
    - dev->tx_queue_len = 0; /* use main radio device queue */
    dev->netdev_ops = &hostap_master_ops;
    break;
    default:
    + dev->tx_queue_len = 0; /* use main radio device queue */
    dev->netdev_ops = &hostap_netdev_ops;
    }




    \
     
     \ /
      Last update: 2010-01-05 21:13    [W:0.022 / U:29.160 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site