Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 249303
b: refs/heads/master
c: b74ac12
h: refs/heads/master
i:
  249301: 863546c
  249299: 3ea7400
  249295: ea648fd
v: v3
  • Loading branch information
Roland Vossen authored and Greg Kroah-Hartman committed May 3, 2011
1 parent 0b75378 commit 0b30d54
Show file tree
Hide file tree
Showing 17 changed files with 136 additions and 213 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e10d82d47dc4fe1d98ab46337324a2f7facc0491
refs/heads/master: b74ac12ecdc23cfc4b13c71f9a2356f51d15c7e8
24 changes: 12 additions & 12 deletions trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ int bcmsdh_intr_enable(void *sdh)
ASSERT(bcmsdh);

status = sdioh_interrupt_set(bcmsdh->sdioh, true);
return SDIOH_API_SUCCESS(status) ? 0 : -BCME_ERROR;
return SDIOH_API_SUCCESS(status) ? 0 : -EBADE;
}

int bcmsdh_intr_disable(void *sdh)
Expand All @@ -136,7 +136,7 @@ int bcmsdh_intr_disable(void *sdh)
ASSERT(bcmsdh);

status = sdioh_interrupt_set(bcmsdh->sdioh, false);
return SDIOH_API_SUCCESS(status) ? 0 : -BCME_ERROR;
return SDIOH_API_SUCCESS(status) ? 0 : -EBADE;
}

int bcmsdh_intr_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh)
Expand All @@ -146,7 +146,7 @@ int bcmsdh_intr_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh)
ASSERT(bcmsdh);

status = sdioh_interrupt_register(bcmsdh->sdioh, fn, argh);
return SDIOH_API_SUCCESS(status) ? 0 : -BCME_ERROR;
return SDIOH_API_SUCCESS(status) ? 0 : -EBADE;
}

int bcmsdh_intr_dereg(void *sdh)
Expand All @@ -156,7 +156,7 @@ int bcmsdh_intr_dereg(void *sdh)
ASSERT(bcmsdh);

status = sdioh_interrupt_deregister(bcmsdh->sdioh);
return SDIOH_API_SUCCESS(status) ? 0 : -BCME_ERROR;
return SDIOH_API_SUCCESS(status) ? 0 : -EBADE;
}

#if defined(DHD_DEBUG)
Expand Down Expand Up @@ -204,7 +204,7 @@ u8 bcmsdh_cfg_read(void *sdh, uint fnc_num, u32 addr, int *err)
&& (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT));
#endif
if (err)
*err = (SDIOH_API_SUCCESS(status) ? 0 : -BCME_SDIO_ERROR);
*err = (SDIOH_API_SUCCESS(status) ? 0 : -EIO);

BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, u8data = 0x%x\n",
__func__, fnc_num, addr, data));
Expand Down Expand Up @@ -239,7 +239,7 @@ bcmsdh_cfg_write(void *sdh, uint fnc_num, u32 addr, u8 data, int *err)
&& (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT));
#endif
if (err)
*err = SDIOH_API_SUCCESS(status) ? 0 : -BCME_SDIO_ERROR;
*err = SDIOH_API_SUCCESS(status) ? 0 : -EIO;

BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, u8data = 0x%x\n",
__func__, fnc_num, addr, data));
Expand All @@ -261,7 +261,7 @@ u32 bcmsdh_cfg_read_word(void *sdh, uint fnc_num, u32 addr, int *err)
fnc_num, addr, &data, 4);

if (err)
*err = (SDIOH_API_SUCCESS(status) ? 0 : -BCME_SDIO_ERROR);
*err = (SDIOH_API_SUCCESS(status) ? 0 : -EIO);

BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, u32data = 0x%x\n",
__func__, fnc_num, addr, data));
Expand All @@ -286,7 +286,7 @@ bcmsdh_cfg_write_word(void *sdh, uint fnc_num, u32 addr, u32 data,
SDIOH_WRITE, fnc_num, addr, &data, 4);

if (err)
*err = (SDIOH_API_SUCCESS(status) ? 0 : -BCME_SDIO_ERROR);
*err = (SDIOH_API_SUCCESS(status) ? 0 : -EIO);

BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, u32data = 0x%x\n",
__func__, fnc_num, addr, data));
Expand Down Expand Up @@ -329,7 +329,7 @@ int bcmsdh_cis_read(void *sdh, uint func, u8 * cis, uint length)
kfree(tmp_buf);
}

return SDIOH_API_SUCCESS(status) ? 0 : -BCME_ERROR;
return SDIOH_API_SUCCESS(status) ? 0 : -EBADE;
}

static int bcmsdhsdio_set_sbaddr_window(void *sdh, u32 address)
Expand Down Expand Up @@ -488,7 +488,7 @@ bcmsdh_recv_buf(void *sdh, u32 addr, uint fn, uint flags,
SDIOH_READ, fn, addr, width, nbytes, buf,
pkt);

return SDIOH_API_SUCCESS(status) ? 0 : -BCME_SDIO_ERROR;
return SDIOH_API_SUCCESS(status) ? 0 : -EIO;
}

int
Expand Down Expand Up @@ -533,7 +533,7 @@ bcmsdh_send_buf(void *sdh, u32 addr, uint fn, uint flags,
SDIOH_WRITE, fn, addr, width, nbytes, buf,
pkt);

return SDIOH_API_SUCCESS(status) ? 0 : -BCME_ERROR;
return SDIOH_API_SUCCESS(status) ? 0 : -EBADE;
}

int bcmsdh_rwdata(void *sdh, uint rw, u32 addr, u8 *buf, uint nbytes)
Expand All @@ -553,7 +553,7 @@ int bcmsdh_rwdata(void *sdh, uint rw, u32 addr, u8 *buf, uint nbytes)
(rw ? SDIOH_WRITE : SDIOH_READ), SDIO_FUNC_1,
addr, 4, nbytes, buf, NULL);

return SDIOH_API_SUCCESS(status) ? 0 : -BCME_ERROR;
return SDIOH_API_SUCCESS(status) ? 0 : -EBADE;
}

int bcmsdh_abort(void *sdh, uint fn)
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name,

if (sdioh_cfg_read
(si, sd_ptr->func, sd_ptr->offset, &data)) {
bcmerror = -BCME_SDIO_ERROR;
bcmerror = -EIO;
break;
}

Expand All @@ -672,7 +672,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name,

if (sdioh_cfg_write
(si, sd_ptr->func, sd_ptr->offset, &data)) {
bcmerror = -BCME_SDIO_ERROR;
bcmerror = -EIO;
break;
}
break;
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ int dhd_prot_hdrpull(dhd_pub_t *dhd, int *ifidx, struct sk_buff *pktbuf)
if (pktbuf->len < BDC_HEADER_LEN) {
DHD_ERROR(("%s: rx data too short (%d < %d)\n", __func__,
pktbuf->len, BDC_HEADER_LEN));
return -BCME_ERROR;
return -EBADE;
}

h = (struct bdc_header *)(pktbuf->data);
Expand All @@ -366,14 +366,14 @@ int dhd_prot_hdrpull(dhd_pub_t *dhd, int *ifidx, struct sk_buff *pktbuf)
if (*ifidx >= DHD_MAX_IFS) {
DHD_ERROR(("%s: rx data ifnum out of range (%d)\n",
__func__, *ifidx));
return -BCME_ERROR;
return -EBADE;
}

if (((h->flags & BDC_FLAG_VER_MASK) >> BDC_FLAG_VER_SHIFT) !=
BDC_PROTO_VER) {
DHD_ERROR(("%s: non-BDC packet received, flags 0x%x\n",
dhd_ifname(dhd, *ifidx), h->flags));
return -BCME_ERROR;
return -EBADE;
}

if (h->flags & BDC_FLAG_SUM_GOOD) {
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -815,14 +815,14 @@ wl_host_event(struct dhd_info *dhd, int *ifidx, void *pktdata,

if (memcmp(BRCM_OUI, &pvt_data->bcm_hdr.oui[0], DOT11_OUI_LEN)) {
DHD_ERROR(("%s: mismatched OUI, bailing\n", __func__));
return -BCME_ERROR;
return -EBADE;
}

/* BRCM event pkt may be unaligned - use xxx_ua to load user_subtype. */
if (get_unaligned_be16(&pvt_data->bcm_hdr.usr_subtype) !=
BCMILCP_BCM_SUBTYPE_EVENT) {
DHD_ERROR(("%s: mismatched subtype, bailing\n", __func__));
return -BCME_ERROR;
return -EBADE;
}

*data_ptr = &pvt_data[1];
Expand Down
55 changes: 4 additions & 51 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1619,51 +1619,6 @@ static int dhd_ethtool(dhd_info_t *dhd, void *uaddr)
return 0;
}

static s16 linuxbcmerrormap[] = { 0, /* 0 */
-EINVAL, /* -BCME_ERROR */
-EINVAL, /* -BCME_BADARG */
-EINVAL, /* -BCME_BADOPTION */
-EINVAL, /* -BCME_NOTUP */
-EINVAL, /* -BCME_NOTDOWN */
-EINVAL, /* -BCME_NOTAP */
-EINVAL, /* -BCME_NOTSTA */
-EINVAL, /* -BCME_BADKEYIDX */
-EINVAL, /* -BCME_RADIOOFF */
-EINVAL, /* -BCME_NOTBANDLOCKED */
-EINVAL, /* -BCME_NOCLK */
-EINVAL, /* -BCME_BADRATESET */
-EINVAL, /* -BCME_BADBAND */
-E2BIG, /* -BCME_BUFTOOSHORT */
-E2BIG, /* -BCME_BUFTOOLONG */
-EBUSY, /* -BCME_BUSY */
-EINVAL, /* -BCME_NOTASSOCIATED */
-EINVAL, /* -BCME_BADSSIDLEN */
-EINVAL, /* -BCME_OUTOFRANGECHAN */
-EINVAL, /* -BCME_BADCHAN */
-EFAULT, /* -BCME_BADADDR */
-ENOMEM, /* -BCME_NORESOURCE */
-EOPNOTSUPP, /* -BCME_UNSUPPORTED */
-EMSGSIZE, /* -BCME_BADLENGTH */
-EINVAL, /* -BCME_NOTREADY */
-EPERM, /* -BCME_NOTPERMITTED */
-ENOMEM, /* -BCME_NOMEM */
-EINVAL, /* -BCME_ASSOCIATED */
-ERANGE, /* -BCME_RANGE */
-EINVAL, /* -BCME_NOTFOUND */
-EINVAL, /* -BCME_WME_NOT_ENABLED */
-EINVAL, /* -BCME_TSPEC_NOTFOUND */
-EINVAL, /* -BCME_ACM_NOTSUPPORTED */
-EINVAL, /* -BCME_NOT_WME_ASSOCIATION */
-EIO, /* -BCME_SDIO_ERROR */
-ENODEV, /* -BCME_DONGLE_DOWN */
-EINVAL, /* -BCME_VERSION */
-EIO, /* -BCME_TXFAIL */
-EIO, /* -BCME_RXFAIL */
-EINVAL, /* -BCME_NODEVICE */
-EINVAL, /* -BCME_NMODE_DISABLED */
-ENODATA, /* -BCME_NONRESIDENT */
};

static int dhd_ioctl_entry(struct net_device *net, struct ifreq *ifr, int cmd)
{
dhd_info_t *dhd = *(dhd_info_t **) netdev_priv(net);
Expand Down Expand Up @@ -1748,12 +1703,12 @@ static int dhd_ioctl_entry(struct net_device *net, struct ifreq *ifr, int cmd)
/* send to dongle (must be up, and wl) */
if ((dhd->pub.busstate != DHD_BUS_DATA)) {
DHD_ERROR(("%s DONGLE_DOWN,__func__\n", __func__));
bcmerror = -BCME_DONGLE_DOWN;
bcmerror = -EIO;
goto done;
}

if (!dhd->pub.iswl) {
bcmerror = -BCME_DONGLE_DOWN;
bcmerror = -EIO;
goto done;
}

Expand Down Expand Up @@ -1781,10 +1736,8 @@ static int dhd_ioctl_entry(struct net_device *net, struct ifreq *ifr, int cmd)

if (bcmerror > 0)
bcmerror = 0;
else if (bcmerror < -BCME_LAST)
bcmerror = -BCME_ERROR;

return linuxbcmerrormap[-bcmerror];
return bcmerror;
}

static int dhd_stop(struct net_device *net)
Expand Down Expand Up @@ -2280,7 +2233,7 @@ int dhd_net_attach(dhd_pub_t *dhdp, int ifidx)

fail:
net->netdev_ops = NULL;
return -BCME_ERROR;
return -EBADE;
}

void dhd_bus_detach(dhd_pub_t *dhdp)
Expand Down
Loading

0 comments on commit 0b30d54

Please sign in to comment.