diff options
author | K. Y. Srinivasan <kys@microsoft.com> | 2011-09-13 18:21:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-16 14:07:19 -0400 |
commit | 6f27457b50c0439388e34d528f0fc200ddedb9a4 (patch) | |
tree | 1910ab0f2a3a378e36ab6207b7bb306182ac79d8 /drivers/staging/hv/rndis_filter.c | |
parent | 3c4debad4290a31d3537bf89837f49d5e48b8271 (diff) |
Staging: hv: netvsc: Cleanup the name and type of link_stat variable
Consistently name the variable tracking the link status. Use a consistent
type for this variable and get rid of some unnecessary parentheses as well.
I would like to thank Joe Perches <joe@perches.com> for suggesting these
changes and patiently helping me get here!
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/rndis_filter.c')
-rw-r--r-- | drivers/staging/hv/rndis_filter.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c index 963582acb6a..ef43f2e95f3 100644 --- a/drivers/staging/hv/rndis_filter.c +++ b/drivers/staging/hv/rndis_filter.c | |||
@@ -41,7 +41,7 @@ struct rndis_device { | |||
41 | struct netvsc_device *net_dev; | 41 | struct netvsc_device *net_dev; |
42 | 42 | ||
43 | enum rndis_device_state state; | 43 | enum rndis_device_state state; |
44 | u32 link_stat; | 44 | bool link_state; |
45 | atomic_t new_req_id; | 45 | atomic_t new_req_id; |
46 | 46 | ||
47 | spinlock_t request_lock; | 47 | spinlock_t request_lock; |
@@ -511,10 +511,15 @@ static int rndis_filter_query_device_mac(struct rndis_device *dev) | |||
511 | static int rndis_filter_query_device_link_status(struct rndis_device *dev) | 511 | static int rndis_filter_query_device_link_status(struct rndis_device *dev) |
512 | { | 512 | { |
513 | u32 size = sizeof(u32); | 513 | u32 size = sizeof(u32); |
514 | u32 link_status; | ||
515 | int ret; | ||
514 | 516 | ||
515 | return rndis_filter_query_device(dev, | 517 | ret = rndis_filter_query_device(dev, |
516 | RNDIS_OID_GEN_MEDIA_CONNECT_STATUS, | 518 | RNDIS_OID_GEN_MEDIA_CONNECT_STATUS, |
517 | &dev->link_stat, &size); | 519 | &link_status, &size); |
520 | dev->link_state = (link_status != 0) ? true : false; | ||
521 | |||
522 | return ret; | ||
518 | } | 523 | } |
519 | 524 | ||
520 | static int rndis_filter_set_packet_filter(struct rndis_device *dev, | 525 | static int rndis_filter_set_packet_filter(struct rndis_device *dev, |
@@ -736,11 +741,11 @@ int rndis_filter_device_add(struct hv_device *dev, | |||
736 | 741 | ||
737 | rndis_filter_query_device_link_status(rndis_device); | 742 | rndis_filter_query_device_link_status(rndis_device); |
738 | 743 | ||
739 | device_info->link_state = rndis_device->link_stat; | 744 | device_info->link_state = rndis_device->link_state; |
740 | 745 | ||
741 | dev_info(&dev->device, "Device MAC %pM link state %s", | 746 | dev_info(&dev->device, "Device MAC %pM link state %s\n", |
742 | rndis_device->hw_mac_adr, | 747 | rndis_device->hw_mac_adr, |
743 | ((device_info->link_state) ? ("down\n") : ("up\n"))); | 748 | device_info->link_state ? "down" : "up"); |
744 | 749 | ||
745 | return ret; | 750 | return ret; |
746 | } | 751 | } |