Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268383
b: refs/heads/master
c: 3c4deba
h: refs/heads/master
i:
  268381: fc2e371
  268379: 81ad68f
  268375: a6e97f6
  268367: 898f085
  268351: 8f580e1
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Sep 16, 2011
1 parent 35dbfc7 commit cf90519
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b13cc345b6f7aae293050c33e86f585ea30b2e38
refs/heads/master: 3c4debad4290a31d3537bf89837f49d5e48b8271
8 changes: 4 additions & 4 deletions trunk/drivers/staging/hv/rndis_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit cf90519

Please sign in to comment.