diff options
| author | Brett Rudley | 2010-12-04 01:30:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-12-07 01:07:09 +0100 |
| commit | 7a9b48b3d3e0f373dc996efde56a5bff0944d8de (patch) | |
| tree | 05854e0e2b6d8f893267dd7757a06738ab7be7b5 /drivers/staging/brcm80211/util | |
| parent | staging: brcm80211: OSLREGOPS is unused, remove checks for it. (diff) | |
| download | kernel-qcow2-linux-7a9b48b3d3e0f373dc996efde56a5bff0944d8de.tar.gz kernel-qcow2-linux-7a9b48b3d3e0f373dc996efde56a5bff0944d8de.tar.xz kernel-qcow2-linux-7a9b48b3d3e0f373dc996efde56a5bff0944d8de.zip | |
staging: brcm80211: Move osl_pub into osl
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/util')
| -rw-r--r-- | drivers/staging/brcm80211/util/linux_osl.c | 8 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/util/siutils.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c index 6a06d61568b9..2efce7aeec78 100644 --- a/drivers/staging/brcm80211/util/linux_osl.c +++ b/drivers/staging/brcm80211/util/linux_osl.c @@ -53,14 +53,14 @@ struct osl_info *osl_attach(void *pdev, uint bustype) case PCI_BUS: case SI_BUS: case PCMCIA_BUS: - osh->pub.mmbus = true; + osh->mmbus = true; break; case JTAG_BUS: case SDIO_BUS: case USB_BUS: case SPI_BUS: case RPC_BUS: - osh->pub.mmbus = false; + osh->mmbus = false; break; default: ASSERT(false); @@ -88,7 +88,7 @@ void *BCMFASTPATH osl_pktget(struct osl_info *osh, uint len) skb_put(skb, len); skb->priority = 0; - osh->pub.pktalloced++; + osh->pktalloced++; } return (void *)skb; @@ -119,7 +119,7 @@ void BCMFASTPATH osl_pktfree(struct osl_info *osh, void *p, bool send) */ dev_kfree_skb(skb); - osh->pub.pktalloced--; + osh->pktalloced--; nest++; skb = nskb; } diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c index 29d2d68354f6..59167122943c 100644 --- a/drivers/staging/brcm80211/util/siutils.c +++ b/drivers/staging/brcm80211/util/siutils.c @@ -729,7 +729,7 @@ void si_detach(si_t *sih) kfree(sii); } -void *si_osh(si_t *sih) +struct osl_info *si_osh(si_t *sih) { si_info_t *sii; |