From: Danny Kukawka <danny.kukawka@bisect.de>
To: Christian Benvenuti <benve@cisco.com>
Cc: Danny Kukawka <dkukawka@suse.de>,
Roopa Prabhu <roprabhu@cisco.com>,
"David S. Miller" <davem@davemloft.net>,
David Wang <dwang2@cisco.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 07/10] cisco/enic: use eth_hw_addr_random() instead of random_ether_addr()
Date: Fri, 17 Feb 2012 16:43:28 +0100 [thread overview]
Message-ID: <1329493411-25750-8-git-send-email-danny.kukawka@bisect.de> (raw)
In-Reply-To: <1329493411-25750-1-git-send-email-danny.kukawka@bisect.de>
Use dev_hw_addr_random() instead of calling random_ether_addr()
to set addr_assign_type correctly to NET_ADDR_RANDOM.
Couldn't replace random_ether_addr() in enic_probe() since
enic_set_mac_addr() is used which would reset addr_assign_type.
Instead set addr_assign_type directly to NET_ADDR_RANDOM in
case of random mac after call enic_set_mac_addr().
Reset the state to NET_ADDR_PERM as soon as the MAC get
changed via .ndo_set_mac_address.
v2: use bitops, adapt to eth_hw_addr_random(), add a comment
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
---
drivers/net/ethernet/cisco/enic/enic_main.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index ab3f67f..ed00cb3 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -865,6 +865,7 @@ static int enic_set_mac_addr(struct net_device *netdev, char *addr)
}
memcpy(netdev->dev_addr, addr, netdev->addr_len);
+ netdev->addr_assign_type &= ~NET_ADDR_RANDOM;
return 0;
}
@@ -1119,7 +1120,7 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,
memcpy(pp->mac_addr, prev_pp.vf_mac, ETH_ALEN);
if (vf == PORT_SELF_VF && is_zero_ether_addr(netdev->dev_addr))
- random_ether_addr(netdev->dev_addr);
+ eth_hw_addr_random(netdev);
err = enic_process_set_pp_request(enic, vf, &prev_pp, &restore_pp);
if (err) {
@@ -2272,6 +2273,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
int err;
#ifdef CONFIG_PCI_IOV
int pos = 0;
+ bool random_mac = false;
#endif
int num_pps = 1;
@@ -2467,8 +2469,10 @@ static int __devinit enic_probe(struct pci_dev *pdev,
(void)enic_change_mtu(netdev, enic->port_mtu);
#ifdef CONFIG_PCI_IOV
- if (enic_is_sriov_vf(enic) && is_zero_ether_addr(enic->mac_addr))
+ if (enic_is_sriov_vf(enic) && is_zero_ether_addr(enic->mac_addr)) {
random_ether_addr(enic->mac_addr);
+ random_mac = true;
+ }
#endif
err = enic_set_mac_addr(netdev, enic->mac_addr);
@@ -2476,6 +2480,12 @@ static int __devinit enic_probe(struct pci_dev *pdev,
dev_err(dev, "Invalid MAC address, aborting\n");
goto err_out_dev_deinit;
}
+#ifdef CONFIG_PCI_IOV
+ if (random_mac) {
+ /*Couldn't use eth_hw_addr_random() due to enic_set_mac_addr()*/
+ netdev->addr_assign_type |= NET_ADDR_RANDOM;
+ }
+#endif
enic->tx_coalesce_usecs = enic->config.intr_timer_usec;
enic->rx_coalesce_usecs = enic->tx_coalesce_usecs;
--
1.7.8.3
next prev parent reply other threads:[~2012-02-17 15:43 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-17 15:43 [PATCH v2 00/10] Part 4: handle addr_assign_type for random addresses Danny Kukawka
2012-02-17 15:43 ` [PATCH v2 01/10] au1000_eth: use eth_hw_addr_random() instead of random_ether_addr() Danny Kukawka
2012-02-17 20:59 ` David Miller
2012-02-17 15:43 ` [PATCH 02/10] lantiq_etop: set addr_assign_type if random_ether_addr() used Danny Kukawka
2012-02-17 21:00 ` David Miller
2012-02-17 21:24 ` Danny Kukawka
2012-02-17 15:43 ` [PATCH v2 03/10] davinci_emac: use eth_hw_addr_random() instead of random_ether_addr() Danny Kukawka
2012-02-17 21:00 ` David Miller
2012-02-17 15:43 ` [PATCH v2 04/10] xilinx ll_temac: " Danny Kukawka
2012-02-17 21:00 ` David Miller
2012-02-17 15:43 ` [PATCH v2 05/10] igbvf: reset netdevice addr_assign_type if changed Danny Kukawka
2012-02-17 21:01 ` David Miller
2012-02-17 15:43 ` [PATCH v2 06/10] batman-adv: use eth_hw_addr_random() instead of random_ether_addr() Danny Kukawka
2012-02-17 21:01 ` David Miller
2012-02-17 15:43 ` Danny Kukawka [this message]
2012-02-17 21:01 ` [PATCH v2 07/10] cisco/enic: " David Miller
2012-02-17 21:35 ` Danny Kukawka
2012-02-17 15:43 ` [PATCH v2 08/10] ethoc: set addr_assign_type if random_ether_addr() used Danny Kukawka
2012-02-17 21:02 ` David Miller
2012-02-17 15:43 ` [PATCH v2 09/10] atheros eth: " Danny Kukawka
2012-02-17 21:02 ` David Miller
2012-02-17 15:43 ` [PATCH 10/10] UML net: " Danny Kukawka
2012-02-17 15:55 ` Richard Weinberger
2012-02-17 20:17 ` David Miller
2012-02-17 21:05 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329493411-25750-8-git-send-email-danny.kukawka@bisect.de \
--to=danny.kukawka@bisect.de \
--cc=benve@cisco.com \
--cc=davem@davemloft.net \
--cc=dkukawka@suse.de \
--cc=dwang2@cisco.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=roprabhu@cisco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®