@@ -1982,13 +1982,29 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
return vi->ctrl->status == VIRTIO_NET_OK;
}
+static int virtnet_ctrl_set_mac_address(struct virtnet_info *vi, const void *addr, int len)
+{
+ struct virtio_device *vdev = vi->vdev;
+ struct scatterlist sg;
+
+ sg_init_one(&sg, addr, len);
+
+ if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MAC,
+ VIRTIO_NET_CTRL_MAC_ADDR_SET, &sg)) {
+ dev_warn(&vdev->dev,
+ "Failed to set mac address by vq command.\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
static int virtnet_set_mac_address(struct net_device *dev, void *p)
{
struct virtnet_info *vi = netdev_priv(dev);
struct virtio_device *vdev = vi->vdev;
int ret;
struct sockaddr *addr;
- struct scatterlist sg;
if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STANDBY))
return -EOPNOTSUPP;
@@ -2002,11 +2018,7 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p)
goto out;
if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_MAC_ADDR)) {
- sg_init_one(&sg, addr->sa_data, dev->addr_len);
- if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MAC,
- VIRTIO_NET_CTRL_MAC_ADDR_SET, &sg)) {
- dev_warn(&vdev->dev,
- "Failed to set mac address by vq command.\n");
+ if (virtnet_ctrl_set_mac_address(vi, addr->sa_data, dev->addr_len)) {
ret = -EINVAL;
goto out;
}
@@ -3822,12 +3834,7 @@ static int virtnet_probe(struct virtio_device *vdev)
*/
if (!virtio_has_feature(vdev, VIRTIO_NET_F_MAC) &&
virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_MAC_ADDR)) {
- struct scatterlist sg;
-
- sg_init_one(&sg, dev->dev_addr, dev->addr_len);
- if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MAC,
- VIRTIO_NET_CTRL_MAC_ADDR_SET, &sg)) {
- pr_debug("virtio_net: setting MAC address failed\n");
+ if (virtnet_ctrl_set_mac_address(vi, dev->dev_addr, dev->addr_len)) {
rtnl_unlock();
err = -EINVAL;
goto free_unregister_netdev;
Separating the code setting MAC by cq to a function. This is to facilitate separating cq-related functions into a separate file. Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> --- drivers/net/virtio/virtnet.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-)