Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b40eed7 authored by Wang Chen's avatar Wang Chen Committed by David S. Miller
Browse files

infiniband: Kill directly reference of netdev->priv 



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: default avatarWang Chen <wangchen@cn.fujitsu.com>
Acked-by: default avatarRoland Dreier <rolandd@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 486bf8de

drivers/infiniband/hw/amso1100/c2_provider.c

+4 −4
Original line number Diff line number Diff line
@@ -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);