|
@@ -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);
|
|
|
|
|