[PATCH v7 26/33] net: ipoib - set name assign type
From: Tom Gundersen <hidden>
Date: 2014-07-10 08:22:31
Also in:
linux-rdma, lkml
Subsystem:
infiniband subsystem, the rest · Maintainers:
Jason Gunthorpe, Leon Romanovsky, Linus Torvalds
When naming a device based on a combination of the parent device, and the upsr-supplied key, inherit the name assign type from the parent. Signed-off-by: Tom Gundersen <redacted> Cc: Roland Dreier <roland@kernel.org> Cc: Sean Hefty <redacted> Cc: Hal Rosenstock <redacted> Cc: Erez Shitrit <redacted> Cc: Michal Schmidt <redacted> Cc: Jim Foraker <redacted> Cc: linux-rdma@vger.kernel.org --- drivers/infiniband/ulp/ipoib/ipoib.h | 2 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 12 +++++++----- drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index c639f90..2654288 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h@@ -464,7 +464,7 @@ void ipoib_reap_ah(struct work_struct *work); void ipoib_mark_paths_invalid(struct net_device *dev); void ipoib_flush_paths(struct net_device *dev); -struct ipoib_dev_priv *ipoib_intf_alloc(const char *format); +struct ipoib_dev_priv *ipoib_intf_alloc(const char *format, unsigned char name_assign_type); int ipoib_ib_dev_init(struct net_device *dev, struct ib_device *ca, int port); void ipoib_ib_dev_flush_light(struct work_struct *work);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 4e675f4..b1d58ef 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c@@ -1390,12 +1390,13 @@ void ipoib_setup(struct net_device *dev) INIT_DELAYED_WORK(&priv->neigh_reap_task, ipoib_reap_neigh); } -struct ipoib_dev_priv *ipoib_intf_alloc(const char *name) +struct ipoib_dev_priv *ipoib_intf_alloc(const char *name, + unsigned char name_assign_type) { struct net_device *dev; - dev = alloc_netdev((int)sizeof(struct ipoib_dev_priv), name, - NET_NAME_UNKNOWN, ipoib_setup); + dev = alloc_netdev((int) sizeof (struct ipoib_dev_priv), name, + name_assign_type, ipoib_setup); if (!dev) return NULL;
@@ -1535,13 +1536,14 @@ int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca) } static struct net_device *ipoib_add_port(const char *format, + unsigned char name_assign_type, struct ib_device *hca, u8 port) { struct ipoib_dev_priv *priv; struct ib_port_attr attr; int result = -ENOMEM; - priv = ipoib_intf_alloc(format); + priv = ipoib_intf_alloc(format, name_assign_type); if (!priv) goto alloc_mem_failed;
@@ -1676,7 +1678,7 @@ static void ipoib_add_one(struct ib_device *device) for (p = s; p <= e; ++p) { if (rdma_port_get_link_layer(device, p) != IB_LINK_LAYER_INFINIBAND) continue; - dev = ipoib_add_port("ib%d", device, p); + dev = ipoib_add_port("ib%d", NET_NAME_ENUM, device, p); if (!IS_ERR(dev)) { priv = netdev_priv(dev); list_add_tail(&priv->list, dev_list);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 9fad7b5..88558d3 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c@@ -133,7 +133,7 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey) snprintf(intf_name, sizeof intf_name, "%s.%04x", ppriv->dev->name, pkey); - priv = ipoib_intf_alloc(intf_name); + priv = ipoib_intf_alloc(intf_name, ppriv->dev->name_assign_type); if (!priv) return -ENOMEM;
--
1.9.3