diff options
| author | Haiyang Zhang <haiyangz@microsoft.com> | 2012-03-12 10:20:50 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-12 17:06:48 -0700 |
| commit | 1f5f3a75e216fe771b8d6805e0bb2f43595a6ee1 (patch) | |
| tree | fc1f3e0c22c908dee660a565fe39f2416bca937b /drivers/net/hyperv/netvsc.c | |
| parent | ef31bef6216db76950c38f1993b45953402f4c63 (diff) | |
| download | op-kernel-dev-1f5f3a75e216fe771b8d6805e0bb2f43595a6ee1.zip op-kernel-dev-1f5f3a75e216fe771b8d6805e0bb2f43595a6ee1.tar.gz | |
net/hyperv: Add support for vlan trunking from guests
With this feature, a Linux guest can now configure multiple vlans through
a single synthetic NIC on Win8 Hyper-V host.
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>
Diffstat (limited to 'drivers/net/hyperv/netvsc.c')
| -rw-r--r-- | drivers/net/hyperv/netvsc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 8965b45..d025c83 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -300,6 +300,7 @@ static int negotiate_nvsp_ver(struct hv_device *device, memset(init_packet, 0, sizeof(struct nvsp_message)); init_packet->hdr.msg_type = NVSP_MSG2_TYPE_SEND_NDIS_CONFIG; init_packet->msg.v2_msg.send_ndis_config.mtu = net_device->ndev->mtu; + init_packet->msg.v2_msg.send_ndis_config.capability.ieee8021q = 1; ret = vmbus_sendpacket(device->channel, init_packet, sizeof(struct nvsp_message), @@ -341,7 +342,7 @@ static int netvsc_connect_vsp(struct hv_device *device) /* Send the ndis version */ memset(init_packet, 0, sizeof(struct nvsp_message)); - ndis_version = 0x00050000; + ndis_version = 0x00050001; init_packet->hdr.msg_type = NVSP_MSG1_TYPE_SEND_NDIS_VER; init_packet->msg.v1_msg. |
