From: Christian Borntraeger <borntraeger@de.ibm.com>

this is a CA 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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/virtio_net.c |    1 -
 1 file changed, 1 deletion(-)

diff -puN drivers/net/virtio_net.c~virtio_net-remove-double-ether_setup drivers/net/virtio_net.c
--- a/drivers/net/virtio_net.c~virtio_net-remove-double-ether_setup
+++ a/drivers/net/virtio_net.c
@@ -331,7 +331,6 @@ static int virtnet_probe(struct virtio_d
 		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;
_