diff options
| author | Roopa Prabhu <roprabhu@cisco.com> | 2010-12-08 13:53:58 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-10 15:42:21 -0800 |
| commit | 0b1c00fc3e9f8d658e0632da7e7ee57bed779ec7 (patch) | |
| tree | 3dc6bd6f7b0cde427c1527e5771ad78f40980eab /drivers/net/enic | |
| parent | 319d7e847355ec7e03d3c865917b2b0e2e592fb8 (diff) | |
| download | op-kernel-dev-0b1c00fc3e9f8d658e0632da7e7ee57bed779ec7.zip op-kernel-dev-0b1c00fc3e9f8d658e0632da7e7ee57bed779ec7.tar.gz | |
enic: Add ndo_set_vf_mac support for enic dynamic devices
This patch implements the ndo_set_vf_mac netdev operation for enic
dynamic devices. It treats the mac address set by IFLA_VF_MAC as a
special case to use it in the port profile provisioning data.
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David Wang <dwang2@cisco.com>
Signed-off-by: Christian Benvenuti <benve@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/enic')
| -rw-r--r-- | drivers/net/enic/enic.h | 3 | ||||
| -rw-r--r-- | drivers/net/enic/enic_main.c | 20 |
2 files changed, 22 insertions, 1 deletions
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index 8f374c1..bd473a9 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h @@ -32,7 +32,7 @@ #define DRV_NAME "enic" #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" -#define DRV_VERSION "1.4.1.8" +#define DRV_VERSION "1.4.1.9" #define DRV_COPYRIGHT "Copyright 2008-2010 Cisco Systems, Inc" #define ENIC_BARS_MAX 6 @@ -61,6 +61,7 @@ struct enic_port_profile { char name[PORT_PROFILE_MAX]; u8 instance_uuid[PORT_UUID_MAX]; u8 host_uuid[PORT_UUID_MAX]; + u8 vf_mac[ETH_ALEN]; }; /* Per-instance private data structure */ diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 1931f15..ddeffb5 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -1231,6 +1231,23 @@ static int enic_dev_init_done(struct enic *enic, int *done, int *error) return err; } +static int enic_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) +{ + struct enic *enic = netdev_priv(netdev); + + if (vf != PORT_SELF_VF) + return -EOPNOTSUPP; + + /* Ignore the vf argument for now. We can assume the request + * is coming on a vf. + */ + if (is_valid_ether_addr(mac)) { + memcpy(enic->pp.vf_mac, mac, ETH_ALEN); + return 0; + } else + return -EINVAL; +} + static int enic_set_port_profile(struct enic *enic, u8 *mac) { struct vic_provinfo *vp; @@ -2411,6 +2428,9 @@ static const struct net_device_ops enic_netdev_dynamic_ops = { .ndo_tx_timeout = enic_tx_timeout, .ndo_set_vf_port = enic_set_vf_port, .ndo_get_vf_port = enic_get_vf_port, +#ifdef IFLA_VF_MAX + .ndo_set_vf_mac = enic_set_vf_mac, +#endif #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = enic_poll_controller, #endif |
