UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

hv_netvsc: move subchannel existence check to netvsc_select_queue() 

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vitaly Kuznetsov 2015-12-01 16:43:11 -08:00 committed by David S. Miller
parent c0eb454034
commit 8b9fbe1ac3
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/hyperv/hyperv_net.h
View File

@ -1272,19 +1272,4 @@ struct rndis_message {
#define TRANSPORT_INFO_IPV6_TCP ((INFO_IPV6 << 16) | INFO_TCP)
#define TRANSPORT_INFO_IPV6_UDP ((INFO_IPV6 << 16) | INFO_UDP)
static inline struct vmbus_channel *get_channel(struct hv_netvsc_packet *packet,
struct netvsc_device *net_device)
{
struct vmbus_channel *out_channel;
out_channel = net_device->chn_table[packet->q_idx];
if (!out_channel) {
out_channel = net_device->dev->channel;
packet->q_idx = 0;
}
return out_channel;
}
#endif /* _HYPERV_NET_H */

5
drivers/net/hyperv/netvsc.c
View File

@ -749,8 +749,8 @@ static inline int netvsc_send_pkt(
struct netvsc_device *net_device)
{
struct nvsp_message nvmsg;
struct vmbus_channel *out_channel = get_channel(packet, net_device);
u16 q_idx = packet->q_idx;
struct vmbus_channel *out_channel = net_device->chn_table[q_idx];
struct net_device *ndev = net_device->ndev;
u64 req_id;
int ret;
@ -859,8 +859,7 @@ int netvsc_send(struct hv_device *device,
if (!net_device)
return -ENODEV;
out_channel = get_channel(packet, net_device);
q_idx = packet->q_idx;
out_channel = net_device->chn_table[q_idx];
packet->send_buf_index = NETVSC_INVALID_INDEX;
packet->cp_partial = false;

3
drivers/net/hyperv/netvsc_drv.c
View File

@ -273,6 +273,9 @@ static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb,
skb_set_hash(skb, hash, PKT_HASH_TYPE_L3);
}
if (!nvsc_dev->chn_table[q_idx])
q_idx = 0;
return q_idx;
}