Virtualization - Dec 2007 - [PATCH resend] virtio_net: remove double ether_setup

Hello Rusty,

this is a small fix for virtio_net.
virtnet_probe already calls alloc_etherdev, which calls ether_setup.
There is no need to do that again.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 drivers/net/virtio_net.c |    1 -
 1 file changed, 1 deletion(-)

Index: kvm/drivers/net/virtio_net.c
==================================================================---
kvm.orig/drivers/net/virtio_net.c
+++ kvm/drivers/net/virtio_net.c
@@ -329,11 +329,10 @@ static int virtnet_probe(struct virtio_d
 	dev = alloc_etherdev(sizeof(struct virtnet_info));
 	if (!dev)
 		return -ENOMEM;
 
 	/* Set up network device as normal. */
-	ether_setup(dev);
 	dev->open = virtnet_open;
 	dev->stop = virtnet_close;
 	dev->hard_start_xmit = start_xmit;
 	dev->features = NETIF_F_HIGHDMA;
 	SET_NETDEV_DEV(dev, &vdev->dev);

On Tuesday 11 December 2007 22:38:53 Christian Borntraeger
wrote:
> Hello Rusty,
>
> this is a small fix for virtio_net.
> virtnet_probe already calls alloc_etherdev, which calls ether_setup.
> There is no need to do that again.
>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>

Can you send straight to akpm or davem?  I'm supposed to be on vacation at
the
moment (and not doing a very good job :)

Thanks,
Rusty.