lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

infiniband: Kill directly reference of netdev->priv

Browse Source 
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.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Acked-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Wang Chen
2008-11-24 15:34:00 -08:00
committed by David S. Miller
parent 486bf8de17
commit 4b40eed73e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/infiniband/hw/amso1100/c2_provider.c
View File

@@ -653,7 +653,7 @@ static int c2_service_destroy(struct iw_cm_id *cm_id)
static int c2_pseudo_up(struct net_device *netdev) static int c2_pseudo_up(struct net_device *netdev)
{ {
struct in_device *ind; struct in_device *ind;
struct c2_dev *c2dev = netdev->priv; struct c2_dev *c2dev = netdev->ml_priv;
ind = in_dev_get(netdev); ind = in_dev_get(netdev);
if (!ind) if (!ind)
@@ -678,7 +678,7 @@ static int c2_pseudo_up(struct net_device *netdev)
static int c2_pseudo_down(struct net_device *netdev) static int c2_pseudo_down(struct net_device *netdev)
{ {
struct in_device *ind; struct in_device *ind;
struct c2_dev *c2dev = netdev->priv; struct c2_dev *c2dev = netdev->ml_priv;
ind = in_dev_get(netdev); ind = in_dev_get(netdev);
if (!ind) if (!ind)
@@ -746,14 +746,14 @@ static struct net_device *c2_pseudo_netdev_init(struct c2_dev *c2dev)
/* change ethxxx to iwxxx */ /* change ethxxx to iwxxx */
strcpy(name, "iw"); strcpy(name, "iw");
strcat(name, &c2dev->netdev->name[3]); strcat(name, &c2dev->netdev->name[3]);
netdev = alloc_netdev(sizeof(*netdev), name, setup); netdev = alloc_netdev(0, name, setup);
if (!netdev) { if (!netdev) {
printk(KERN_ERR PFX "%s - etherdev alloc failed", printk(KERN_ERR PFX "%s - etherdev alloc failed",
__func__); __func__);
return NULL; return NULL;
} }
netdev->priv = c2dev; netdev->ml_priv = c2dev;
SET_NETDEV_DEV(netdev, &c2dev->pcidev->dev); SET_NETDEV_DEV(netdev, &c2dev->pcidev->dev);