diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 15:07:11 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 15:07:11 -0500 |
| commit | c902f981b79b512eb3d0c0410f8cae88c78beb57 (patch) | |
| tree | 6c18ba859a0d11d14402b3c1b303f00f0e561915 /drivers/net/wireless/hermes.h | |
| parent | 97bae8dc961f59e81e85c7f92ff04f5ff73c20e8 (diff) | |
| parent | f7492f17f2123f0f4db5f9e8ba89867a7b352658 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/wireless/hermes.h')
| -rw-r--r-- | drivers/net/wireless/hermes.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/hermes.h b/drivers/net/wireless/hermes.h index a6bd472d75d4..7644f72a9f4e 100644 --- a/drivers/net/wireless/hermes.h +++ b/drivers/net/wireless/hermes.h @@ -372,12 +372,12 @@ int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0, struct hermes_response *resp); int hermes_allocate(hermes_t *hw, u16 size, u16 *fid); -int hermes_bap_pread(hermes_t *hw, int bap, void *buf, unsigned len, +int hermes_bap_pread(hermes_t *hw, int bap, void *buf, int len, u16 id, u16 offset); -int hermes_bap_pwrite(hermes_t *hw, int bap, const void *buf, unsigned len, +int hermes_bap_pwrite(hermes_t *hw, int bap, const void *buf, int len, u16 id, u16 offset); int hermes_bap_pwrite_pad(hermes_t *hw, int bap, const void *buf, - unsigned data_len, unsigned len, u16 id, u16 offset); + unsigned data_len, int len, u16 id, u16 offset); int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned buflen, u16 *length, void *buf); int hermes_write_ltv(hermes_t *hw, int bap, u16 rid, |