netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH next]infiniband: Kill directly reference of netdev->priv
@ 2008-11-24  9:31 Wang Chen
  2008-11-24 17:01 ` Roland Dreier
  0 siblings, 1 reply; 3+ messages in thread
From: Wang Chen @ 2008-11-24  9:31 UTC (permalink / raw)
  To: David S. Miller, NETDEV, rolandd, sean.hefty, hal.rosenstock,
	general

This use of netdev->priv is wrong.
The right way is:
alloc_netdev() with no memory for private data.
make netdev->ml_priv to point to c2_dev.

I am doing this kind of work for net-next tree.
So I send this patch to Dave, although infiniband's maintainer is
not him.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
---
 drivers/infiniband/hw/amso1100/c2_provider.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c
index 69580e2..5119d65 100644
--- a/drivers/infiniband/hw/amso1100/c2_provider.c
+++ b/drivers/infiniband/hw/amso1100/c2_provider.c
@@ -653,7 +653,7 @@ static int c2_service_destroy(struct iw_cm_id *cm_id)
 static int c2_pseudo_up(struct net_device *netdev)
 {
 	struct in_device *ind;
-	struct c2_dev *c2dev = netdev->priv;
+	struct c2_dev *c2dev = netdev->ml_priv;
 
 	ind = in_dev_get(netdev);
 	if (!ind)
@@ -678,7 +678,7 @@ static int c2_pseudo_up(struct net_device *netdev)
 static int c2_pseudo_down(struct net_device *netdev)
 {
 	struct in_device *ind;
-	struct c2_dev *c2dev = netdev->priv;
+	struct c2_dev *c2dev = netdev->ml_priv;
 
 	ind = in_dev_get(netdev);
 	if (!ind)
@@ -746,14 +746,14 @@ static struct net_device *c2_pseudo_netdev_init(struct c2_dev *c2dev)
 	/* change ethxxx to iwxxx */
 	strcpy(name, "iw");
 	strcat(name, &c2dev->netdev->name[3]);
-	netdev = alloc_netdev(sizeof(*netdev), name, setup);
+	netdev = alloc_netdev(0, name, setup);
 	if (!netdev) {
 		printk(KERN_ERR PFX "%s -  etherdev alloc failed",
 			__func__);
 		return NULL;
 	}
 
-	netdev->priv = c2dev;
+	netdev->ml_priv = c2dev;
 
 	SET_NETDEV_DEV(netdev, &c2dev->pcidev->dev);
 
-- 
1.5.3.4



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH next]infiniband: Kill directly reference of netdev->priv
  2008-11-24  9:31 [PATCH next]infiniband: Kill directly reference of netdev->priv Wang Chen
@ 2008-11-24 17:01 ` Roland Dreier
  2008-11-24 23:34   ` David Miller
  0 siblings, 1 reply; 3+ messages in thread
From: Roland Dreier @ 2008-11-24 17:01 UTC (permalink / raw)
  To: Wang Chen
  Cc: David S. Miller, NETDEV, rolandd, sean.hefty, hal.rosenstock,
	general

Looks fine to me.

Acked-by: Roland Dreier <rolandd@cisco.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH next]infiniband: Kill directly reference of netdev->priv
  2008-11-24 17:01 ` Roland Dreier
@ 2008-11-24 23:34   ` David Miller
  0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2008-11-24 23:34 UTC (permalink / raw)
  To: rdreier; +Cc: wangchen, netdev, rolandd, sean.hefty, hal.rosenstock, general

From: Roland Dreier <rdreier@cisco.com>
Date: Mon, 24 Nov 2008 09:01:28 -0800

> Looks fine to me.
> 
> Acked-by: Roland Dreier <rolandd@cisco.com>

Applied, thanks everyone.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-11-24 23:34 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-24  9:31 [PATCH next]infiniband: Kill directly reference of netdev->priv Wang Chen
2008-11-24 17:01 ` Roland Dreier
2008-11-24 23:34   ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).