| Message ID | 1498125664-25980-3-git-send-email-arend.vanspriel@broadcom.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a833f3d4de53921263f6a060dbff08d5af926ba7 |
| Delegated to: | Kalle Valo |
| Headers | show |
Arend van Spriel <arend.vanspriel@broadcom.com> writes: > The statistic counter is used in common layer and in the bus layer > in different thread contexts so change to use atomic operations. > > Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com> > Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com> > Reviewed-by: Franky Lin <franky.lin@broadcom.com> > Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> > --- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 2 +- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h > index e2c895b..e1a4d9e 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h > @@ -138,7 +138,7 @@ struct brcmf_bus { > struct brcmf_pub *drvr; > enum brcmf_bus_state state; > uint maxctl; > - unsigned long tx_realloc; > + atomic_t tx_realloc; > u32 chip; > u32 chiprev; > bool always_use_fws_queue; > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c > index 81f9594..a280536 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c > @@ -2046,7 +2046,7 @@ static int brcmf_sdio_txpkt_hdalign(struct brcmf_sdio *bus, struct sk_buff *pkt) > head_pad = ((unsigned long)dat_buf % bus->head_align); > if (head_pad) { > if (skb_headroom(pkt) < head_pad) { > - bus->sdiodev->bus_if->tx_realloc++; > + atomic_inc(&bus->sdiodev->bus_if->tx_realloc); What's the point of this field? AFAICS it's only incremented but never read. What am I missing?
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h index e2c895b..e1a4d9e 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h @@ -138,7 +138,7 @@ struct brcmf_bus { struct brcmf_pub *drvr; enum brcmf_bus_state state; uint maxctl; - unsigned long tx_realloc; + atomic_t tx_realloc; u32 chip; u32 chiprev; bool always_use_fws_queue; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 81f9594..a280536 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -2046,7 +2046,7 @@ static int brcmf_sdio_txpkt_hdalign(struct brcmf_sdio *bus, struct sk_buff *pkt) head_pad = ((unsigned long)dat_buf % bus->head_align); if (head_pad) { if (skb_headroom(pkt) < head_pad) { - bus->sdiodev->bus_if->tx_realloc++; + atomic_inc(&bus->sdiodev->bus_if->tx_realloc); head_pad = 0; if (skb_cow(pkt, head_pad)) return -ENOMEM;