diff options
| author |   Arik Nemtsov <arik@wizery.com> | 2012-02-28 00:41:29 +0200 |
|---|---|---|
| committer |   Luciano Coelho <coelho@ti.com> | 2012-02-28 13:19:19 +0200 |
| commit | 0b0e32b792b4077c113ae70d6de12b5f301e0882 (patch) | |
| tree | a7254db28e6209f6a0dd703ae6a9060d4a27db81 /drivers/net/wireless/wl12xx | |
| parent | wl12xx: set the ELP entry delay to the FW dyn-ps timeout (diff) | |
| download | linux-dev-0b0e32b792b4077c113ae70d6de12b5f301e0882.tar.xz linux-dev-0b0e32b792b4077c113ae70d6de12b5f301e0882.zip | |
wl12xx: change bits in the link_map under spin lock
These bits are used in op_tx to determine if a packet should be dropped.
As such we should use the spin lock to sync the state.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx')
| -rw-r--r-- | drivers/net/wireless/wl12xx/cmd.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c index b776d9d5efe8..ef994dacf8d2 100644 --- a/drivers/net/wireless/wl12xx/cmd.c +++ b/drivers/net/wireless/wl12xx/cmd.c @@ -459,23 +459,32 @@ out: int wl12xx_allocate_link(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 *hlid) { + unsigned long flags; u8 link = find_first_zero_bit(wl->links_map, WL12XX_MAX_LINKS); if (link >= WL12XX_MAX_LINKS) return -EBUSY; + /* these bits are used by op_tx */ + spin_lock_irqsave(&wl->wl_lock, flags); __set_bit(link, wl->links_map); __set_bit(link, wlvif->links_map); + spin_unlock_irqrestore(&wl->wl_lock, flags); *hlid = link; return 0; } void wl12xx_free_link(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 *hlid) { + unsigned long flags; + if (*hlid == WL12XX_INVALID_LINK_ID) return; + /* these bits are used by op_tx */ + spin_lock_irqsave(&wl->wl_lock, flags); __clear_bit(*hlid, wl->links_map); __clear_bit(*hlid, wlvif->links_map); + spin_unlock_irqrestore(&wl->wl_lock, flags); *hlid = WL12XX_INVALID_LINK_ID; } |