diff options
author | Haiyang Zhang <haiyangz@microsoft.com> | 2015-04-06 18:22:52 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-04-07 18:45:32 -0400 |
commit | 0d158852a8089099a6959ae235b20f230871982f (patch) | |
tree | ccfd07ad395bfce49745fafcc3a8881920246642 | |
parent | 2646c831c00c5d22aa72b79d24069c1b412cda7c (diff) |
hv_netvsc: Clean up two unused variables
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/hyperv/hyperv_net.h | 1 | ||||
-rw-r--r-- | drivers/net/hyperv/netvsc.c | 1 | ||||
-rw-r--r-- | drivers/net/hyperv/rndis_filter.c | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index 309adee6e791..95a25e4b2601 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h | |||
@@ -130,7 +130,6 @@ struct hv_netvsc_packet { | |||
130 | u32 status; | 130 | u32 status; |
131 | bool part_of_skb; | 131 | bool part_of_skb; |
132 | 132 | ||
133 | struct hv_device *device; | ||
134 | bool is_data_pkt; | 133 | bool is_data_pkt; |
135 | bool xmit_more; /* from skb */ | 134 | bool xmit_more; /* from skb */ |
136 | u16 vlan_tci; | 135 | u16 vlan_tci; |
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index f69923695b5b..7e83c6ad4bb5 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c | |||
@@ -1011,7 +1011,6 @@ static void netvsc_receive(struct netvsc_device *net_device, | |||
1011 | } | 1011 | } |
1012 | 1012 | ||
1013 | count = vmxferpage_packet->range_cnt; | 1013 | count = vmxferpage_packet->range_cnt; |
1014 | netvsc_packet->device = device; | ||
1015 | netvsc_packet->channel = channel; | 1014 | netvsc_packet->channel = channel; |
1016 | 1015 | ||
1017 | /* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */ | 1016 | /* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */ |
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c index a1604376aee1..0d92efefd796 100644 --- a/drivers/net/hyperv/rndis_filter.c +++ b/drivers/net/hyperv/rndis_filter.c | |||
@@ -47,8 +47,6 @@ struct rndis_request { | |||
47 | 47 | ||
48 | /* Simplify allocation by having a netvsc packet inline */ | 48 | /* Simplify allocation by having a netvsc packet inline */ |
49 | struct hv_netvsc_packet pkt; | 49 | struct hv_netvsc_packet pkt; |
50 | /* Set 2 pages for rndis requests crossing page boundary */ | ||
51 | struct hv_page_buffer buf[2]; | ||
52 | 50 | ||
53 | struct rndis_message request_msg; | 51 | struct rndis_message request_msg; |
54 | /* | 52 | /* |