diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-05-11 18:16:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-12 15:04:19 -0400 |
commit | 8cdddc3f9d6692f5690841468a9f63c19fb734ed (patch) | |
tree | 9a2f0b7bb86d6dda3e48a0fba5aa39297a8d4dc5 /drivers/net/usb | |
parent | 007e5c8e6aad8526e234b2481d2104e3e1fe8b88 (diff) |
usb/net: rndis: eliminate first set of duplicate OIDs
The RNDIS protocol contains a vast number of Object ID:s (OIDs).
The current definitions had multiple definitions of these ID:s,
let's use the nicely RNDIS_*-prefixed defines from the HyperV
implementation, rename everywhere they're used, and copy+rename
the few that were missing from this list of objects.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index 3b7ddfd25fd..dd342dca9d7 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c | |||
@@ -396,7 +396,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) | |||
396 | phym = NULL; | 396 | phym = NULL; |
397 | reply_len = sizeof *phym; | 397 | reply_len = sizeof *phym; |
398 | retval = rndis_query(dev, intf, u.buf, | 398 | retval = rndis_query(dev, intf, u.buf, |
399 | cpu_to_le32(OID_GEN_PHYSICAL_MEDIUM), | 399 | cpu_to_le32(RNDIS_OID_GEN_PHYSICAL_MEDIUM), |
400 | 0, (void **) &phym, &reply_len); | 400 | 0, (void **) &phym, &reply_len); |
401 | if (retval != 0 || !phym) { | 401 | if (retval != 0 || !phym) { |
402 | /* OID is optional so don't fail here. */ | 402 | /* OID is optional so don't fail here. */ |
@@ -421,7 +421,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) | |||
421 | /* Get designated host ethernet address */ | 421 | /* Get designated host ethernet address */ |
422 | reply_len = ETH_ALEN; | 422 | reply_len = ETH_ALEN; |
423 | retval = rndis_query(dev, intf, u.buf, | 423 | retval = rndis_query(dev, intf, u.buf, |
424 | cpu_to_le32(OID_802_3_PERMANENT_ADDRESS), | 424 | cpu_to_le32(RNDIS_OID_802_3_PERMANENT_ADDRESS), |
425 | 48, (void **) &bp, &reply_len); | 425 | 48, (void **) &bp, &reply_len); |
426 | if (unlikely(retval< 0)) { | 426 | if (unlikely(retval< 0)) { |
427 | dev_err(&intf->dev, "rndis get ethaddr, %d\n", retval); | 427 | dev_err(&intf->dev, "rndis get ethaddr, %d\n", retval); |
@@ -434,7 +434,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) | |||
434 | memset(u.set, 0, sizeof *u.set); | 434 | memset(u.set, 0, sizeof *u.set); |
435 | u.set->msg_type = cpu_to_le32(RNDIS_MSG_SET); | 435 | u.set->msg_type = cpu_to_le32(RNDIS_MSG_SET); |
436 | u.set->msg_len = cpu_to_le32(4 + sizeof *u.set); | 436 | u.set->msg_len = cpu_to_le32(4 + sizeof *u.set); |
437 | u.set->oid = cpu_to_le32(OID_GEN_CURRENT_PACKET_FILTER); | 437 | u.set->oid = cpu_to_le32(RNDIS_OID_GEN_CURRENT_PACKET_FILTER); |
438 | u.set->len = cpu_to_le32(4); | 438 | u.set->len = cpu_to_le32(4); |
439 | u.set->offset = cpu_to_le32((sizeof *u.set) - 8); | 439 | u.set->offset = cpu_to_le32((sizeof *u.set) - 8); |
440 | *(__le32 *)(u.buf + sizeof *u.set) = cpu_to_le32(RNDIS_DEFAULT_FILTER); | 440 | *(__le32 *)(u.buf + sizeof *u.set) = cpu_to_le32(RNDIS_DEFAULT_FILTER); |