aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ibm/ibmveth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/ibm/ibmveth.c')
-rw-r--r--drivers/net/ethernet/ibm/ibmveth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index 5d41aee69d16..952d795230a4 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1185,7 +1185,7 @@ static void ibmveth_set_multicast_list(struct net_device *netdev)
1185 netdev_for_each_mc_addr(ha, netdev) { 1185 netdev_for_each_mc_addr(ha, netdev) {
1186 /* add the multicast address to the filter table */ 1186 /* add the multicast address to the filter table */
1187 unsigned long mcast_addr = 0; 1187 unsigned long mcast_addr = 0;
1188 memcpy(((char *)&mcast_addr)+2, ha->addr, 6); 1188 memcpy(((char *)&mcast_addr)+2, ha->addr, ETH_ALEN);
1189 lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address, 1189 lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address,
1190 IbmVethMcastAddFilter, 1190 IbmVethMcastAddFilter,
1191 mcast_addr); 1191 mcast_addr);
@@ -1370,7 +1370,7 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id)
1370 netif_napi_add(netdev, &adapter->napi, ibmveth_poll, 16); 1370 netif_napi_add(netdev, &adapter->napi, ibmveth_poll, 16);
1371 1371
1372 adapter->mac_addr = 0; 1372 adapter->mac_addr = 0;
1373 memcpy(&adapter->mac_addr, mac_addr_p, 6); 1373 memcpy(&adapter->mac_addr, mac_addr_p, ETH_ALEN);
1374 1374
1375 netdev->irq = dev->irq; 1375 netdev->irq = dev->irq;
1376 netdev->netdev_ops = &ibmveth_netdev_ops; 1376 netdev->netdev_ops = &ibmveth_netdev_ops;