From cf90519faeac2a2c2f52995d80925ecec17e1c6a Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 13 Sep 2011 10:59:56 -0700 Subject: [PATCH] --- yaml --- r: 268383 b: refs/heads/master c: 3c4debad4290a31d3537bf89837f49d5e48b8271 h: refs/heads/master i: 268381: fc2e3715362e43f1e34fceb0c8c49b32c3c548ac 268379: 81ad68f2d38aa5164b4c38d9209ac0b8a5c3bb07 268375: a6e97f69b1748a3994e6a1e9febb88a441ff948c 268367: 898f0852b97e3927ce764dbca5535fba344dddb8 268351: 8f580e11405a05d5bd6544ea76b2eddaa65666d3 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/rndis_filter.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a711a984936d..aaa9761300ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b13cc345b6f7aae293050c33e86f585ea30b2e38 +refs/heads/master: 3c4debad4290a31d3537bf89837f49d5e48b8271 diff --git a/trunk/drivers/staging/hv/rndis_filter.c b/trunk/drivers/staging/hv/rndis_filter.c index bfe91292e9e0..963582acb6ae 100644 --- a/trunk/drivers/staging/hv/rndis_filter.c +++ b/trunk/drivers/staging/hv/rndis_filter.c @@ -691,7 +691,7 @@ int rndis_filter_device_add(struct hv_device *dev, int ret; struct netvsc_device *net_device; struct rndis_device *rndis_device; - struct netvsc_device_info *deviceInfo = additional_info; + struct netvsc_device_info *device_info = additional_info; rndis_device = get_rndis_device(); if (!rndis_device) @@ -732,15 +732,15 @@ int rndis_filter_device_add(struct hv_device *dev, */ } - memcpy(deviceInfo->mac_adr, rndis_device->hw_mac_adr, ETH_ALEN); + memcpy(device_info->mac_adr, rndis_device->hw_mac_adr, ETH_ALEN); rndis_filter_query_device_link_status(rndis_device); - deviceInfo->link_state = rndis_device->link_stat; + device_info->link_state = rndis_device->link_stat; dev_info(&dev->device, "Device MAC %pM link state %s", rndis_device->hw_mac_adr, - ((deviceInfo->link_state) ? ("down\n") : ("up\n"))); + ((device_info->link_state) ? ("down\n") : ("up\n"))); return ret; }