]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
rt2800: remove warning on bcn_num != rt2x00dev->intf_beaconing
authorStanislaw Gruszka <sgruszka@redhat.com>
Fri, 13 Jan 2017 14:55:07 +0000 (15:55 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 19 Jan 2017 12:48:16 +0000 (14:48 +0200)
Since rt2800pci update beacon settings asynchronously from
tbtt tasklet, without beacon_skb_mutex protection, number of
currently active beacons entries can be different than
number pointed by rt2x00dev->intf_beaconing. Remove warning
about that inconsistency.

Reported-by: evaxige@qq.com
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/ralink/rt2x00/rt2800lib.c

index ff047dc5cc2cfd88a2d06e928a0338c49cacc170..f36bc9bf55bdbdc2debbc643678d60122327b5cc 100644 (file)
@@ -967,8 +967,6 @@ static void rt2800_update_beacons_setup(struct rt2x00_dev *rt2x00dev)
                bcn_num++;
        }
 
-       WARN_ON_ONCE(bcn_num != rt2x00dev->intf_beaconing);
-
        rt2800_register_write(rt2x00dev, BCN_OFFSET0, (u32) reg);
        rt2800_register_write(rt2x00dev, BCN_OFFSET1, (u32) (reg >> 32));