Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268384
b: refs/heads/master
c: 6f27457
h: refs/heads/master
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Sep 16, 2011
1 parent cf90519 commit 0a0703d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 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: 3c4debad4290a31d3537bf89837f49d5e48b8271
refs/heads/master: 6f27457b50c0439388e34d528f0fc200ddedb9a4
17 changes: 11 additions & 6 deletions trunk/drivers/staging/hv/rndis_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ struct rndis_device {
struct netvsc_device *net_dev;

enum rndis_device_state state;
u32 link_stat;
bool link_state;
atomic_t new_req_id;

spinlock_t request_lock;
Expand Down Expand Up @@ -511,10 +511,15 @@ static int rndis_filter_query_device_mac(struct rndis_device *dev)
static int rndis_filter_query_device_link_status(struct rndis_device *dev)
{
u32 size = sizeof(u32);
u32 link_status;
int ret;

return rndis_filter_query_device(dev,
ret = rndis_filter_query_device(dev,
RNDIS_OID_GEN_MEDIA_CONNECT_STATUS,
&dev->link_stat, &size);
&link_status, &size);
dev->link_state = (link_status != 0) ? true : false;

return ret;
}

static int rndis_filter_set_packet_filter(struct rndis_device *dev,
Expand Down Expand Up @@ -736,11 +741,11 @@ int rndis_filter_device_add(struct hv_device *dev,

rndis_filter_query_device_link_status(rndis_device);

device_info->link_state = rndis_device->link_stat;
device_info->link_state = rndis_device->link_state;

dev_info(&dev->device, "Device MAC %pM link state %s",
dev_info(&dev->device, "Device MAC %pM link state %s\n",
rndis_device->hw_mac_adr,
((device_info->link_state) ? ("down\n") : ("up\n")));
device_info->link_state ? "down" : "up");

return ret;
}
Expand Down

0 comments on commit 0a0703d

Please sign in to comment.