]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net/ibmveth: fix panic in probe
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 11 May 2009 21:44:51 +0000 (21:44 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 17 May 2009 22:19:36 +0000 (15:19 -0700)
netdev->dev_addr changed from being an array to being a pointer, so we
should not take its address for memcpy().

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ibmveth.c

index 53af71aceb8a62bdeb2c78258462f41170e312a9..0995c438f286d4fb580828b5a339612a4d0f6ac2 100644 (file)
@@ -1285,7 +1285,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
        netdev->features |= NETIF_F_LLTX;
        spin_lock_init(&adapter->stats_lock);
 
-       memcpy(&netdev->dev_addr, &adapter->mac_addr, netdev->addr_len);
+       memcpy(netdev->dev_addr, &adapter->mac_addr, netdev->addr_len);
 
        for(i = 0; i<IbmVethNumBufferPools; i++) {
                struct kobject *kobj = &adapter->rx_buff_pool[i].kobj;