lkml.org 
[lkml]   [2010]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 094/149] ath5k: retain promiscuous setting
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

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

    From: Bob Copeland <me@bobcopeland.com>

    commit 6b5dcccb495b66b3b0b9581cdccfed038e5d68a2 upstream.

    Commit 56d1de0a21db28e41741cfa0a66e18bc8d920554, "ath5k: clean up
    filter flags setting" introduced a regression in monitor mode such
    that the promisc filter flag would get lost.

    Although we set the promisc flag when it changed, we did not
    preserve it across subsequent calls to configure_filter. This patch
    restores the original functionality.

    Bisected-by: weedy2887@gmail.com
    Tested-by: weedy2887@gmail.com
    Tested-by: Rick Farina <sidhayn@gmail.com>
    Signed-off-by: Bob Copeland <me@bobcopeland.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/wireless/ath/ath5k/base.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/net/wireless/ath/ath5k/base.c
    +++ b/drivers/net/wireless/ath/ath5k/base.c
    @@ -2975,13 +2975,15 @@ static void ath5k_configure_filter(struc

    if (changed_flags & (FIF_PROMISC_IN_BSS | FIF_OTHER_BSS)) {
    if (*new_flags & FIF_PROMISC_IN_BSS) {
    - rfilt |= AR5K_RX_FILTER_PROM;
    __set_bit(ATH_STAT_PROMISC, sc->status);
    } else {
    __clear_bit(ATH_STAT_PROMISC, sc->status);
    }
    }

    + if (test_bit(ATH_STAT_PROMISC, sc->status))
    + rfilt |= AR5K_RX_FILTER_PROM;
    +
    /* Note, AR5K_RX_FILTER_MCAST is already enabled */
    if (*new_flags & FIF_ALLMULTI) {
    mfilt[0] = ~0;



    \
     
     \ /
      Last update: 2010-07-01 20:41    [W:4.030 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site