diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-29 00:28:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-29 00:28:46 -0400 |
| commit | 332e4af80d1214fbf0e263e1408fc7c5b64ecdd6 (patch) | |
| tree | 7c8f8ada7ab8fc9cb2497d95e52dce4d2c4493a3 /drivers/net/wireless/rndis_wlan.c | |
| parent | 1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9 (diff) | |
| parent | be0976be9148f31ee0d1997354c3e30ff8d07587 (diff) | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wireless/rndis_wlan.c')
| -rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index a36d2c85e26e..f001f2afd05e 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
| @@ -448,7 +448,7 @@ static int rndis_query_oid(struct usbnet *dev, __le32 oid, void *data, int *len) | |||
| 448 | u.get->msg_len = ccpu2(sizeof *u.get); | 448 | u.get->msg_len = ccpu2(sizeof *u.get); |
| 449 | u.get->oid = oid; | 449 | u.get->oid = oid; |
| 450 | 450 | ||
| 451 | ret = rndis_command(dev, u.header); | 451 | ret = rndis_command(dev, u.header, buflen); |
| 452 | if (ret == 0) { | 452 | if (ret == 0) { |
| 453 | ret = le32_to_cpu(u.get_c->len); | 453 | ret = le32_to_cpu(u.get_c->len); |
| 454 | *len = (*len > ret) ? ret : *len; | 454 | *len = (*len > ret) ? ret : *len; |
| @@ -498,7 +498,7 @@ static int rndis_set_oid(struct usbnet *dev, __le32 oid, void *data, int len) | |||
| 498 | u.set->handle = ccpu2(0); | 498 | u.set->handle = ccpu2(0); |
| 499 | memcpy(u.buf + sizeof(*u.set), data, len); | 499 | memcpy(u.buf + sizeof(*u.set), data, len); |
| 500 | 500 | ||
| 501 | ret = rndis_command(dev, u.header); | 501 | ret = rndis_command(dev, u.header, buflen); |
| 502 | if (ret == 0) | 502 | if (ret == 0) |
| 503 | ret = rndis_error_status(u.set_c->status); | 503 | ret = rndis_error_status(u.set_c->status); |
| 504 | 504 | ||