virtio_net: fix adding vids on big-endian
Programming vids (adding or removing them) still passes
guest-endian values in the DMA buffer. That's wrong
if guest is big-endian and when virtio 1 is enabled.
Note: this is on top of a previous patch:
virtio_net: split out ctrl buffer
Fixes: 9465a7a6f
("virtio_net: enable v1.0 support")
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
12e5716938
commit
d7fad4c840
|
@ -154,7 +154,7 @@ struct control_buf {
|
|||
struct virtio_net_ctrl_mq mq;
|
||||
u8 promisc;
|
||||
u8 allmulti;
|
||||
u16 vid;
|
||||
__virtio16 vid;
|
||||
u64 offloads;
|
||||
};
|
||||
|
||||
|
@ -1725,7 +1725,7 @@ static int virtnet_vlan_rx_add_vid(struct net_device *dev,
|
|||
struct virtnet_info *vi = netdev_priv(dev);
|
||||
struct scatterlist sg;
|
||||
|
||||
vi->ctrl->vid = vid;
|
||||
vi->ctrl->vid = cpu_to_virtio16(vi->vdev, vid);
|
||||
sg_init_one(&sg, &vi->ctrl->vid, sizeof(vi->ctrl->vid));
|
||||
|
||||
if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
|
||||
|
@ -1740,7 +1740,7 @@ static int virtnet_vlan_rx_kill_vid(struct net_device *dev,
|
|||
struct virtnet_info *vi = netdev_priv(dev);
|
||||
struct scatterlist sg;
|
||||
|
||||
vi->ctrl->vid = vid;
|
||||
vi->ctrl->vid = cpu_to_virtio16(vi->vdev, vid);
|
||||
sg_init_one(&sg, &vi->ctrl->vid, sizeof(vi->ctrl->vid));
|
||||
|
||||
if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
|
||||
|
|
Loading…
Reference in New Issue