diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-11 17:44:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-17 18:19:36 -0400 |
commit | d44b5e07c6813e6d747f7f947f1da5f0abf14eb4 (patch) | |
tree | b6f59f1e62b9c5d704d69bef96ad485ac1579d77 /drivers/net/ibmveth.c | |
parent | 6d45522c532be430b2ed63ed48a6a9e15328af66 (diff) |
net/ibmveth: fix panic in probe
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>
Diffstat (limited to 'drivers/net/ibmveth.c')
-rw-r--r-- | drivers/net/ibmveth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 53af71aceb8a..0995c438f286 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
@@ -1285,7 +1285,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_ | |||
1285 | netdev->features |= NETIF_F_LLTX; | 1285 | netdev->features |= NETIF_F_LLTX; |
1286 | spin_lock_init(&adapter->stats_lock); | 1286 | spin_lock_init(&adapter->stats_lock); |
1287 | 1287 | ||
1288 | memcpy(&netdev->dev_addr, &adapter->mac_addr, netdev->addr_len); | 1288 | memcpy(netdev->dev_addr, &adapter->mac_addr, netdev->addr_len); |
1289 | 1289 | ||
1290 | for(i = 0; i<IbmVethNumBufferPools; i++) { | 1290 | for(i = 0; i<IbmVethNumBufferPools; i++) { |
1291 | struct kobject *kobj = &adapter->rx_buff_pool[i].kobj; | 1291 | struct kobject *kobj = &adapter->rx_buff_pool[i].kobj; |