diff options
author | Joe Perches <joe@perches.com> | 2015-03-02 22:54:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-03 17:01:36 -0500 |
commit | c7bf716940c6a8ed39b444bfb0b97c2939ac312b (patch) | |
tree | 4f21527a5cfb43f724b5dd2ea65e530d9ec64ea3 /drivers/net/ethernet | |
parent | e8ab38cfcb6eac7f4e7e3b8e787a9d4bea54c2cb (diff) |
ethernet: Use eth_<foo>_addr instead of memset
Use the built-in function instead of memset.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/amd/pcnet32.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_main.c | 8 | ||||
-rw-r--r-- | drivers/net/ethernet/emulex/benet/be_cmds.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/micrel/ksz884x.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlge/qlge_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/ti/netcp_core.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 |
17 files changed, 25 insertions, 25 deletions
diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c index 11d6e6561df1..8eb37e0194b5 100644 --- a/drivers/net/ethernet/amd/pcnet32.c +++ b/drivers/net/ethernet/amd/pcnet32.c | |||
@@ -1708,7 +1708,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) | |||
1708 | 1708 | ||
1709 | /* if the ethernet address is not valid, force to 00:00:00:00:00:00 */ | 1709 | /* if the ethernet address is not valid, force to 00:00:00:00:00:00 */ |
1710 | if (!is_valid_ether_addr(dev->dev_addr)) | 1710 | if (!is_valid_ether_addr(dev->dev_addr)) |
1711 | memset(dev->dev_addr, 0, ETH_ALEN); | 1711 | eth_zero_addr(dev->dev_addr); |
1712 | 1712 | ||
1713 | if (pcnet32_debug & NETIF_MSG_PROBE) { | 1713 | if (pcnet32_debug & NETIF_MSG_PROBE) { |
1714 | pr_cont(" %pM", dev->dev_addr); | 1714 | pr_cont(" %pM", dev->dev_addr); |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c index ffe4e003e636..e3d853cab7c9 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | |||
@@ -2446,7 +2446,7 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode) | |||
2446 | } | 2446 | } |
2447 | packet = skb_put(skb, pkt_size); | 2447 | packet = skb_put(skb, pkt_size); |
2448 | memcpy(packet, bp->dev->dev_addr, ETH_ALEN); | 2448 | memcpy(packet, bp->dev->dev_addr, ETH_ALEN); |
2449 | memset(packet + ETH_ALEN, 0, ETH_ALEN); | 2449 | eth_zero_addr(packet + ETH_ALEN); |
2450 | memset(packet + 2*ETH_ALEN, 0x77, (ETH_HLEN - 2*ETH_ALEN)); | 2450 | memset(packet + 2*ETH_ALEN, 0x77, (ETH_HLEN - 2*ETH_ALEN)); |
2451 | for (i = ETH_HLEN; i < pkt_size; i++) | 2451 | for (i = ETH_HLEN; i < pkt_size; i++) |
2452 | packet[i] = (unsigned char) (i & 0xff); | 2452 | packet[i] = (unsigned char) (i & 0xff); |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 7155e1d2c208..98dcb03fe1b8 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |||
@@ -11546,13 +11546,13 @@ static void bnx2x_get_cnic_mac_hwinfo(struct bnx2x *bp) | |||
11546 | /* Disable iSCSI OOO if MAC configuration is invalid. */ | 11546 | /* Disable iSCSI OOO if MAC configuration is invalid. */ |
11547 | if (!is_valid_ether_addr(iscsi_mac)) { | 11547 | if (!is_valid_ether_addr(iscsi_mac)) { |
11548 | bp->flags |= NO_ISCSI_OOO_FLAG | NO_ISCSI_FLAG; | 11548 | bp->flags |= NO_ISCSI_OOO_FLAG | NO_ISCSI_FLAG; |
11549 | memset(iscsi_mac, 0, ETH_ALEN); | 11549 | eth_zero_addr(iscsi_mac); |
11550 | } | 11550 | } |
11551 | 11551 | ||
11552 | /* Disable FCoE if MAC configuration is invalid. */ | 11552 | /* Disable FCoE if MAC configuration is invalid. */ |
11553 | if (!is_valid_ether_addr(fip_mac)) { | 11553 | if (!is_valid_ether_addr(fip_mac)) { |
11554 | bp->flags |= NO_FCOE_FLAG; | 11554 | bp->flags |= NO_FCOE_FLAG; |
11555 | memset(bp->fip_mac, 0, ETH_ALEN); | 11555 | eth_zero_addr(bp->fip_mac); |
11556 | } | 11556 | } |
11557 | } | 11557 | } |
11558 | 11558 | ||
@@ -11563,7 +11563,7 @@ static void bnx2x_get_mac_hwinfo(struct bnx2x *bp) | |||
11563 | int port = BP_PORT(bp); | 11563 | int port = BP_PORT(bp); |
11564 | 11564 | ||
11565 | /* Zero primary MAC configuration */ | 11565 | /* Zero primary MAC configuration */ |
11566 | memset(bp->dev->dev_addr, 0, ETH_ALEN); | 11566 | eth_zero_addr(bp->dev->dev_addr); |
11567 | 11567 | ||
11568 | if (BP_NOMCP(bp)) { | 11568 | if (BP_NOMCP(bp)) { |
11569 | BNX2X_ERROR("warning: random MAC workaround active\n"); | 11569 | BNX2X_ERROR("warning: random MAC workaround active\n"); |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c index e5aca2de1871..8638d6c97caa 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | |||
@@ -2693,7 +2693,7 @@ int bnx2x_get_vf_config(struct net_device *dev, int vfidx, | |||
2693 | memcpy(&ivi->mac, bulletin->mac, ETH_ALEN); | 2693 | memcpy(&ivi->mac, bulletin->mac, ETH_ALEN); |
2694 | else | 2694 | else |
2695 | /* function has not been loaded yet. Show mac as 0s */ | 2695 | /* function has not been loaded yet. Show mac as 0s */ |
2696 | memset(&ivi->mac, 0, ETH_ALEN); | 2696 | eth_zero_addr(ivi->mac); |
2697 | 2697 | ||
2698 | /* vlan */ | 2698 | /* vlan */ |
2699 | if (bulletin->valid_bitmap & (1 << VLAN_VALID)) | 2699 | if (bulletin->valid_bitmap & (1 << VLAN_VALID)) |
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index 9cbe038a388e..a368c0a96ec7 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c | |||
@@ -893,7 +893,7 @@ static int enic_set_vf_port(struct net_device *netdev, int vf, | |||
893 | } else { | 893 | } else { |
894 | memset(pp, 0, sizeof(*pp)); | 894 | memset(pp, 0, sizeof(*pp)); |
895 | if (vf == PORT_SELF_VF) | 895 | if (vf == PORT_SELF_VF) |
896 | memset(netdev->dev_addr, 0, ETH_ALEN); | 896 | eth_zero_addr(netdev->dev_addr); |
897 | } | 897 | } |
898 | } else { | 898 | } else { |
899 | /* Set flag to indicate that the port assoc/disassoc | 899 | /* Set flag to indicate that the port assoc/disassoc |
@@ -903,14 +903,14 @@ static int enic_set_vf_port(struct net_device *netdev, int vf, | |||
903 | 903 | ||
904 | /* If DISASSOCIATE, clean up all assigned/saved macaddresses */ | 904 | /* If DISASSOCIATE, clean up all assigned/saved macaddresses */ |
905 | if (pp->request == PORT_REQUEST_DISASSOCIATE) { | 905 | if (pp->request == PORT_REQUEST_DISASSOCIATE) { |
906 | memset(pp->mac_addr, 0, ETH_ALEN); | 906 | eth_zero_addr(pp->mac_addr); |
907 | if (vf == PORT_SELF_VF) | 907 | if (vf == PORT_SELF_VF) |
908 | memset(netdev->dev_addr, 0, ETH_ALEN); | 908 | eth_zero_addr(netdev->dev_addr); |
909 | } | 909 | } |
910 | } | 910 | } |
911 | 911 | ||
912 | if (vf == PORT_SELF_VF) | 912 | if (vf == PORT_SELF_VF) |
913 | memset(pp->vf_mac, 0, ETH_ALEN); | 913 | eth_zero_addr(pp->vf_mac); |
914 | 914 | ||
915 | return err; | 915 | return err; |
916 | } | 916 | } |
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c index f6db7b3e9b70..be00695b3be7 100644 --- a/drivers/net/ethernet/emulex/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c | |||
@@ -3076,7 +3076,7 @@ int be_cmd_get_perm_mac(struct be_adapter *adapter, u8 *mac) | |||
3076 | int status; | 3076 | int status; |
3077 | bool pmac_valid = false; | 3077 | bool pmac_valid = false; |
3078 | 3078 | ||
3079 | memset(mac, 0, ETH_ALEN); | 3079 | eth_zero_addr(mac); |
3080 | 3080 | ||
3081 | if (BEx_chip(adapter)) { | 3081 | if (BEx_chip(adapter)) { |
3082 | if (be_physfn(adapter)) | 3082 | if (be_physfn(adapter)) |
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index b2277a4c7ddf..7eccebc676e2 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c | |||
@@ -3218,7 +3218,7 @@ static int be_setup_wol(struct be_adapter *adapter, bool enable) | |||
3218 | int status = 0; | 3218 | int status = 0; |
3219 | u8 mac[ETH_ALEN]; | 3219 | u8 mac[ETH_ALEN]; |
3220 | 3220 | ||
3221 | memset(mac, 0, ETH_ALEN); | 3221 | eth_zero_addr(mac); |
3222 | 3222 | ||
3223 | cmd.size = sizeof(struct be_cmd_req_acpi_wol_magic_config); | 3223 | cmd.size = sizeof(struct be_cmd_req_acpi_wol_magic_config); |
3224 | cmd.va = dma_zalloc_coherent(&adapter->pdev->dev, cmd.size, &cmd.dma, | 3224 | cmd.va = dma_zalloc_coherent(&adapter->pdev->dev, cmd.size, &cmd.dma, |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 70cc4c5c0a01..903664ff6904 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
@@ -3924,7 +3924,7 @@ static void ixgbe_flush_sw_mac_table(struct ixgbe_adapter *adapter) | |||
3924 | for (i = 0; i < hw->mac.num_rar_entries; i++) { | 3924 | for (i = 0; i < hw->mac.num_rar_entries; i++) { |
3925 | adapter->mac_table[i].state |= IXGBE_MAC_STATE_MODIFIED; | 3925 | adapter->mac_table[i].state |= IXGBE_MAC_STATE_MODIFIED; |
3926 | adapter->mac_table[i].state &= ~IXGBE_MAC_STATE_IN_USE; | 3926 | adapter->mac_table[i].state &= ~IXGBE_MAC_STATE_IN_USE; |
3927 | memset(adapter->mac_table[i].addr, 0, ETH_ALEN); | 3927 | eth_zero_addr(adapter->mac_table[i].addr); |
3928 | adapter->mac_table[i].queue = 0; | 3928 | adapter->mac_table[i].queue = 0; |
3929 | } | 3929 | } |
3930 | ixgbe_sync_mac_table(adapter); | 3930 | ixgbe_sync_mac_table(adapter); |
@@ -3992,7 +3992,7 @@ int ixgbe_del_mac_filter(struct ixgbe_adapter *adapter, u8 *addr, u16 queue) | |||
3992 | adapter->mac_table[i].queue == queue) { | 3992 | adapter->mac_table[i].queue == queue) { |
3993 | adapter->mac_table[i].state |= IXGBE_MAC_STATE_MODIFIED; | 3993 | adapter->mac_table[i].state |= IXGBE_MAC_STATE_MODIFIED; |
3994 | adapter->mac_table[i].state &= ~IXGBE_MAC_STATE_IN_USE; | 3994 | adapter->mac_table[i].state &= ~IXGBE_MAC_STATE_IN_USE; |
3995 | memset(adapter->mac_table[i].addr, 0, ETH_ALEN); | 3995 | eth_zero_addr(adapter->mac_table[i].addr); |
3996 | adapter->mac_table[i].queue = 0; | 3996 | adapter->mac_table[i].queue = 0; |
3997 | ixgbe_sync_mac_table(adapter); | 3997 | ixgbe_sync_mac_table(adapter); |
3998 | return 0; | 3998 | return 0; |
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index 2a210c4efb89..c59ed925adaf 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c | |||
@@ -1685,7 +1685,7 @@ int mlx4_en_start_port(struct net_device *dev) | |||
1685 | } | 1685 | } |
1686 | 1686 | ||
1687 | /* Attach rx QP to bradcast address */ | 1687 | /* Attach rx QP to bradcast address */ |
1688 | memset(&mc_list[10], 0xff, ETH_ALEN); | 1688 | eth_broadcast_addr(&mc_list[10]); |
1689 | mc_list[5] = priv->port; /* needed for B0 steering support */ | 1689 | mc_list[5] = priv->port; /* needed for B0 steering support */ |
1690 | if (mlx4_multicast_attach(mdev->dev, &priv->rss_map.indir_qp, mc_list, | 1690 | if (mlx4_multicast_attach(mdev->dev, &priv->rss_map.indir_qp, mc_list, |
1691 | priv->port, 0, MLX4_PROT_ETH, | 1691 | priv->port, 0, MLX4_PROT_ETH, |
@@ -1788,7 +1788,7 @@ void mlx4_en_stop_port(struct net_device *dev, int detach) | |||
1788 | } | 1788 | } |
1789 | 1789 | ||
1790 | /* Detach All multicasts */ | 1790 | /* Detach All multicasts */ |
1791 | memset(&mc_list[10], 0xff, ETH_ALEN); | 1791 | eth_broadcast_addr(&mc_list[10]); |
1792 | mc_list[5] = priv->port; /* needed for B0 steering support */ | 1792 | mc_list[5] = priv->port; /* needed for B0 steering support */ |
1793 | mlx4_multicast_detach(mdev->dev, &priv->rss_map.indir_qp, mc_list, | 1793 | mlx4_multicast_detach(mdev->dev, &priv->rss_map.indir_qp, mc_list, |
1794 | MLX4_PROT_ETH, priv->broadcast_id); | 1794 | MLX4_PROT_ETH, priv->broadcast_id); |
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_selftest.c b/drivers/net/ethernet/mellanox/mlx4/en_selftest.c index 2d8ee66138e8..4e789479f00f 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_selftest.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_selftest.c | |||
@@ -66,7 +66,7 @@ static int mlx4_en_test_loopback_xmit(struct mlx4_en_priv *priv) | |||
66 | ethh = (struct ethhdr *)skb_put(skb, sizeof(struct ethhdr)); | 66 | ethh = (struct ethhdr *)skb_put(skb, sizeof(struct ethhdr)); |
67 | packet = (unsigned char *)skb_put(skb, packet_size); | 67 | packet = (unsigned char *)skb_put(skb, packet_size); |
68 | memcpy(ethh->h_dest, priv->dev->dev_addr, ETH_ALEN); | 68 | memcpy(ethh->h_dest, priv->dev->dev_addr, ETH_ALEN); |
69 | memset(ethh->h_source, 0, ETH_ALEN); | 69 | eth_zero_addr(ethh->h_source); |
70 | ethh->h_proto = htons(ETH_P_ARP); | 70 | ethh->h_proto = htons(ETH_P_ARP); |
71 | skb_set_mac_header(skb, 0); | 71 | skb_set_mac_header(skb, 0); |
72 | for (i = 0; i < packet_size; ++i) /* fill our packet */ | 72 | for (i = 0; i < packet_size; ++i) /* fill our packet */ |
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c index 10988fbf47eb..6f332ebdf3b5 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/drivers/net/ethernet/micrel/ksz884x.c | |||
@@ -4144,7 +4144,7 @@ static int hw_del_addr(struct ksz_hw *hw, u8 *mac_addr) | |||
4144 | 4144 | ||
4145 | for (i = 0; i < hw->addr_list_size; i++) { | 4145 | for (i = 0; i < hw->addr_list_size; i++) { |
4146 | if (ether_addr_equal(hw->address[i], mac_addr)) { | 4146 | if (ether_addr_equal(hw->address[i], mac_addr)) { |
4147 | memset(hw->address[i], 0, ETH_ALEN); | 4147 | eth_zero_addr(hw->address[i]); |
4148 | writel(0, hw->io + ADD_ADDR_INCR * i + | 4148 | writel(0, hw->io + ADD_ADDR_INCR * i + |
4149 | KS_ADD_ADDR_0_HI); | 4149 | KS_ADD_ADDR_0_HI); |
4150 | return 0; | 4150 | return 0; |
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c index 716fc37ada5a..db80eb1c6d4f 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | |||
@@ -537,7 +537,7 @@ static void netxen_p2_nic_set_multi(struct net_device *netdev) | |||
537 | u8 null_addr[ETH_ALEN]; | 537 | u8 null_addr[ETH_ALEN]; |
538 | int i; | 538 | int i; |
539 | 539 | ||
540 | memset(null_addr, 0, ETH_ALEN); | 540 | eth_zero_addr(null_addr); |
541 | 541 | ||
542 | if (netdev->flags & IFF_PROMISC) { | 542 | if (netdev->flags & IFF_PROMISC) { |
543 | 543 | ||
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c index 8011ef3e7707..25800a1dedcb 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c | |||
@@ -460,7 +460,7 @@ static int ql_set_mac_addr(struct ql_adapter *qdev, int set) | |||
460 | netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev, | 460 | netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev, |
461 | "Set Mac addr %pM\n", addr); | 461 | "Set Mac addr %pM\n", addr); |
462 | } else { | 462 | } else { |
463 | memset(zero_mac_addr, 0, ETH_ALEN); | 463 | eth_zero_addr(zero_mac_addr); |
464 | addr = &zero_mac_addr[0]; | 464 | addr = &zero_mac_addr[0]; |
465 | netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev, | 465 | netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev, |
466 | "Clearing MAC address\n"); | 466 | "Clearing MAC address\n"); |
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index 2965c6ae7d6e..41047c9143d0 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c | |||
@@ -843,7 +843,7 @@ static int smsc911x_phy_loopbacktest(struct net_device *dev) | |||
843 | unsigned long flags; | 843 | unsigned long flags; |
844 | 844 | ||
845 | /* Initialise tx packet using broadcast destination address */ | 845 | /* Initialise tx packet using broadcast destination address */ |
846 | memset(pdata->loopback_tx_pkt, 0xff, ETH_ALEN); | 846 | eth_broadcast_addr(pdata->loopback_tx_pkt); |
847 | 847 | ||
848 | /* Use incrementing source address */ | 848 | /* Use incrementing source address */ |
849 | for (i = 6; i < 12; i++) | 849 | for (i = 6; i < 12; i++) |
diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c index a31a8c3c8e7c..9f14d8b515c7 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c | |||
@@ -1320,7 +1320,7 @@ static struct netcp_addr *netcp_addr_add(struct netcp_intf *netcp, | |||
1320 | if (addr) | 1320 | if (addr) |
1321 | ether_addr_copy(naddr->addr, addr); | 1321 | ether_addr_copy(naddr->addr, addr); |
1322 | else | 1322 | else |
1323 | memset(naddr->addr, 0, ETH_ALEN); | 1323 | eth_zero_addr(naddr->addr); |
1324 | list_add_tail(&naddr->node, &netcp->addr_list); | 1324 | list_add_tail(&naddr->node, &netcp->addr_list); |
1325 | 1325 | ||
1326 | return naddr; | 1326 | return naddr; |
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c index 0a7f2e77557f..13214a6492ac 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c +++ b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | |||
@@ -1167,7 +1167,7 @@ static int gelic_wl_set_ap(struct net_device *netdev, | |||
1167 | } else { | 1167 | } else { |
1168 | pr_debug("%s: clear bssid\n", __func__); | 1168 | pr_debug("%s: clear bssid\n", __func__); |
1169 | clear_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat); | 1169 | clear_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat); |
1170 | memset(wl->bssid, 0, ETH_ALEN); | 1170 | eth_zero_addr(wl->bssid); |
1171 | } | 1171 | } |
1172 | spin_unlock_irqrestore(&wl->lock, irqflag); | 1172 | spin_unlock_irqrestore(&wl->lock, irqflag); |
1173 | pr_debug("%s: ->\n", __func__); | 1173 | pr_debug("%s: ->\n", __func__); |
@@ -1189,7 +1189,7 @@ static int gelic_wl_get_ap(struct net_device *netdev, | |||
1189 | memcpy(data->ap_addr.sa_data, wl->active_bssid, | 1189 | memcpy(data->ap_addr.sa_data, wl->active_bssid, |
1190 | ETH_ALEN); | 1190 | ETH_ALEN); |
1191 | } else | 1191 | } else |
1192 | memset(data->ap_addr.sa_data, 0, ETH_ALEN); | 1192 | eth_zero_addr(data->ap_addr.sa_data); |
1193 | 1193 | ||
1194 | spin_unlock_irqrestore(&wl->lock, irqflag); | 1194 | spin_unlock_irqrestore(&wl->lock, irqflag); |
1195 | mutex_unlock(&wl->assoc_stat_lock); | 1195 | mutex_unlock(&wl->assoc_stat_lock); |
diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c index f7e0f0f7c2e2..44ff8d7c64a5 100644 --- a/drivers/net/ethernet/xscale/ixp4xx_eth.c +++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c | |||
@@ -954,7 +954,7 @@ static void eth_set_mcast_list(struct net_device *dev) | |||
954 | return; | 954 | return; |
955 | } | 955 | } |
956 | 956 | ||
957 | memset(diffs, 0, ETH_ALEN); | 957 | eth_zero_addr(diffs); |
958 | 958 | ||
959 | addr = NULL; | 959 | addr = NULL; |
960 | netdev_for_each_mc_addr(ha, dev) { | 960 | netdev_for_each_mc_addr(ha, dev) { |