Skip to content

Commit

Permalink
rndis_wlan: cleanup: byteswap data from device instead of RNDIS_* def…
Browse files Browse the repository at this point in the history
…ines

All other values from device provided buffer are byteswapped, so it seems more
logical to do same for these.

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>
  • Loading branch information
Jussi Kivilinna authored and David S. Miller committed May 12, 2012
1 parent 3eef366 commit 117599e
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions drivers/net/wireless/rndis_wlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -623,8 +623,8 @@ static int rndis_akm_suite_to_key_mgmt(u32 akm_suite)
#ifdef DEBUG
static const char *oid_to_string(__le32 oid)
{
switch (oid) {
#define OID_STR(oid) case cpu_to_le32(oid): return(#oid)
switch (le32_to_cpu(oid)) {
#define OID_STR(oid) case oid: return(#oid)
/* from rndis_host.h */
OID_STR(RNDIS_OID_802_3_PERMANENT_ADDRESS);
OID_STR(RNDIS_OID_GEN_MAXIMUM_FRAME_SIZE);
Expand Down Expand Up @@ -687,19 +687,19 @@ static const char *oid_to_string(__le32 oid)
static int rndis_error_status(__le32 rndis_status)
{
int ret = -EINVAL;
switch (rndis_status) {
case cpu_to_le32(RNDIS_STATUS_SUCCESS):
switch (le32_to_cpu(rndis_status)) {
case RNDIS_STATUS_SUCCESS:
ret = 0;
break;
case cpu_to_le32(RNDIS_STATUS_FAILURE):
case cpu_to_le32(RNDIS_STATUS_INVALID_DATA):
case RNDIS_STATUS_FAILURE:
case RNDIS_STATUS_INVALID_DATA:
ret = -EINVAL;
break;
case cpu_to_le32(RNDIS_STATUS_NOT_SUPPORTED):
case RNDIS_STATUS_NOT_SUPPORTED:
ret = -EOPNOTSUPP;
break;
case cpu_to_le32(RNDIS_STATUS_ADAPTER_NOT_READY):
case cpu_to_le32(RNDIS_STATUS_ADAPTER_NOT_OPEN):
case RNDIS_STATUS_ADAPTER_NOT_READY:
case RNDIS_STATUS_ADAPTER_NOT_OPEN:
ret = -EBUSY;
break;
}
Expand Down Expand Up @@ -3075,8 +3075,8 @@ static void rndis_wlan_indication(struct usbnet *usbdev, void *ind, int buflen)
struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
struct rndis_indicate *msg = ind;

switch (msg->status) {
case cpu_to_le32(RNDIS_STATUS_MEDIA_CONNECT):
switch (le32_to_cpu(msg->status)) {
case RNDIS_STATUS_MEDIA_CONNECT:
if (priv->current_command_oid == cpu_to_le32(RNDIS_OID_802_11_ADD_KEY)) {
/* OID_802_11_ADD_KEY causes sometimes extra
* "media connect" indications which confuses driver
Expand All @@ -3096,15 +3096,15 @@ static void rndis_wlan_indication(struct usbnet *usbdev, void *ind, int buflen)
queue_work(priv->workqueue, &priv->work);
break;

case cpu_to_le32(RNDIS_STATUS_MEDIA_DISCONNECT):
case RNDIS_STATUS_MEDIA_DISCONNECT:
netdev_info(usbdev->net, "media disconnect\n");

/* queue work to avoid recursive calls into rndis_command */
set_bit(WORK_LINK_DOWN, &priv->work_pending);
queue_work(priv->workqueue, &priv->work);
break;

case cpu_to_le32(RNDIS_STATUS_MEDIA_SPECIFIC_INDICATION):
case RNDIS_STATUS_MEDIA_SPECIFIC_INDICATION:
rndis_wlan_media_specific_indication(usbdev, msg, buflen);
break;

Expand Down

0 comments on commit 117599e

Please sign in to comment.