hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

brcm80211: fmac: change function txcomplete parameter 

Change parameter to device pointer for bus layer interface function
brcmf_txcomplete. This is part of the fullmac bus interface
refactoring.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Franky Lin 2011-12-16 18:36:58 -08:00 committed by John W. Linville
parent 2b4590569e
commit c995788f47
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/brcm80211/brcmfmac/dhd.h
View File

@ -728,7 +728,7 @@ static inline void brcmf_rx_packet(struct brcmf_pub *drvr, int ifidx,
extern char *brcmf_ifname(struct brcmf_pub *drvr, int idx); extern char *brcmf_ifname(struct brcmf_pub *drvr, int idx);
/* Notify tx completion */ /* Notify tx completion */
extern void brcmf_txcomplete(struct brcmf_pub *drvr, struct sk_buff *txp, extern void brcmf_txcomplete(struct device *dev, struct sk_buff *txp,
bool success); bool success);
/* Query dongle */ /* Query dongle */

4
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
View File

@ -460,11 +460,13 @@ void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx,
} }
} }
void brcmf_txcomplete(struct brcmf_pub *drvr, struct sk_buff *txp, bool success) void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success)
{ {
uint ifidx; uint ifidx;
struct ethhdr *eh; struct ethhdr *eh;
u16 type; u16 type;
struct brcmf_bus *bus_if = dev_get_drvdata(dev);
struct brcmf_pub *drvr = bus_if->drvr;
brcmf_proto_hdrpull(drvr, &ifidx, txp); brcmf_proto_hdrpull(drvr, &ifidx, txp);

4
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
View File

@ -2230,7 +2230,7 @@ done:
/* restore pkt buffer pointer before calling tx complete routine */ /* restore pkt buffer pointer before calling tx complete routine */
skb_pull(pkt, SDPCM_HDRLEN + pad); skb_pull(pkt, SDPCM_HDRLEN + pad);
up(&bus->sdsem); up(&bus->sdsem);
brcmf_txcomplete(bus->drvr, pkt, ret != 0); brcmf_txcomplete(bus->sdiodev->dev, pkt, ret != 0);
down(&bus->sdsem); down(&bus->sdsem);
if (free_pkt) if (free_pkt)
@ -2592,7 +2592,7 @@ int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
spin_lock_bh(&bus->txqlock); spin_lock_bh(&bus->txqlock);
if (brcmf_c_prec_enq(bus->drvr, &bus->txq, pkt, prec) == false) { if (brcmf_c_prec_enq(bus->drvr, &bus->txq, pkt, prec) == false) {
skb_pull(pkt, SDPCM_HDRLEN); skb_pull(pkt, SDPCM_HDRLEN);
brcmf_txcomplete(bus->drvr, pkt, false); brcmf_txcomplete(bus->sdiodev->dev, pkt, false);
brcmu_pkt_buf_free_skb(pkt); brcmu_pkt_buf_free_skb(pkt);
brcmf_dbg(ERROR, "out of bus->txq !!!\n"); brcmf_dbg(ERROR, "out of bus->txq !!!\n");
ret = -ENOSR; ret = -ENOSR;