diff options
author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2012-05-11 18:17:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-12 15:18:00 -0400 |
commit | 5432bdc053727b9206220d2cf1f390bf91a05389 (patch) | |
tree | 6126161a064fbc6c8311185256a2b5a59b216a71 /drivers/net/usb | |
parent | 117599e0be7f3916b8863193569fdff64e954183 (diff) |
rndis_host: cleanup: change oid from __le32 to u32 in rndis_query()
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/rndis_host.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index 74315fdd4ada..0d746b3fdef1 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c | |||
@@ -239,7 +239,7 @@ EXPORT_SYMBOL_GPL(rndis_command); | |||
239 | * ActiveSync 4.1 Windows driver. | 239 | * ActiveSync 4.1 Windows driver. |
240 | */ | 240 | */ |
241 | static int rndis_query(struct usbnet *dev, struct usb_interface *intf, | 241 | static int rndis_query(struct usbnet *dev, struct usb_interface *intf, |
242 | void *buf, __le32 oid, u32 in_len, | 242 | void *buf, u32 oid, u32 in_len, |
243 | void **reply, int *reply_len) | 243 | void **reply, int *reply_len) |
244 | { | 244 | { |
245 | int retval; | 245 | int retval; |
@@ -256,7 +256,7 @@ static int rndis_query(struct usbnet *dev, struct usb_interface *intf, | |||
256 | memset(u.get, 0, sizeof *u.get + in_len); | 256 | memset(u.get, 0, sizeof *u.get + in_len); |
257 | u.get->msg_type = cpu_to_le32(RNDIS_MSG_QUERY); | 257 | u.get->msg_type = cpu_to_le32(RNDIS_MSG_QUERY); |
258 | u.get->msg_len = cpu_to_le32(sizeof *u.get + in_len); | 258 | u.get->msg_len = cpu_to_le32(sizeof *u.get + in_len); |
259 | u.get->oid = oid; | 259 | u.get->oid = cpu_to_le32(oid); |
260 | u.get->len = cpu_to_le32(in_len); | 260 | u.get->len = cpu_to_le32(in_len); |
261 | u.get->offset = cpu_to_le32(20); | 261 | u.get->offset = cpu_to_le32(20); |
262 | 262 | ||
@@ -399,8 +399,8 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) | |||
399 | phym = NULL; | 399 | phym = NULL; |
400 | reply_len = sizeof *phym; | 400 | reply_len = sizeof *phym; |
401 | retval = rndis_query(dev, intf, u.buf, | 401 | retval = rndis_query(dev, intf, u.buf, |
402 | cpu_to_le32(RNDIS_OID_GEN_PHYSICAL_MEDIUM), | 402 | RNDIS_OID_GEN_PHYSICAL_MEDIUM, |
403 | 0, (void **) &phym, &reply_len); | 403 | 0, (void **) &phym, &reply_len); |
404 | if (retval != 0 || !phym) { | 404 | if (retval != 0 || !phym) { |
405 | /* OID is optional so don't fail here. */ | 405 | /* OID is optional so don't fail here. */ |
406 | phym_unspec = cpu_to_le32(RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED); | 406 | phym_unspec = cpu_to_le32(RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED); |
@@ -424,8 +424,8 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) | |||
424 | /* Get designated host ethernet address */ | 424 | /* Get designated host ethernet address */ |
425 | reply_len = ETH_ALEN; | 425 | reply_len = ETH_ALEN; |
426 | retval = rndis_query(dev, intf, u.buf, | 426 | retval = rndis_query(dev, intf, u.buf, |
427 | cpu_to_le32(RNDIS_OID_802_3_PERMANENT_ADDRESS), | 427 | RNDIS_OID_802_3_PERMANENT_ADDRESS, |
428 | 48, (void **) &bp, &reply_len); | 428 | 48, (void **) &bp, &reply_len); |
429 | if (unlikely(retval< 0)) { | 429 | if (unlikely(retval< 0)) { |
430 | dev_err(&intf->dev, "rndis get ethaddr, %d\n", retval); | 430 | dev_err(&intf->dev, "rndis get ethaddr, %d\n", retval); |
431 | goto halt_fail_and_release; | 431 | goto halt_fail_and_release; |