Commit 4c264484 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

[NET]: Convert dvb-net to use alloc_netdev().

parent d6381d50
...@@ -456,7 +456,7 @@ static struct net_device_stats * dvb_net_get_stats(struct net_device *dev) ...@@ -456,7 +456,7 @@ static struct net_device_stats * dvb_net_get_stats(struct net_device *dev)
} }
static int dvb_net_init_dev(struct net_device *dev) static void dvb_net_setup(struct net_device *dev)
{ {
ether_setup(dev); ether_setup(dev);
...@@ -472,8 +472,6 @@ static int dvb_net_init_dev(struct net_device *dev) ...@@ -472,8 +472,6 @@ static int dvb_net_init_dev(struct net_device *dev)
dev->hard_header_cache = NULL; dev->hard_header_cache = NULL;
dev->flags |= IFF_NOARP; dev->flags |= IFF_NOARP;
return 0;
} }
static int get_if(struct dvb_net *dvbnet) static int get_if(struct dvb_net *dvbnet)
...@@ -495,7 +493,6 @@ static int get_if(struct dvb_net *dvbnet) ...@@ -495,7 +493,6 @@ static int get_if(struct dvb_net *dvbnet)
static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid) static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid)
{ {
struct net_device *net; struct net_device *net;
struct dmx_demux *demux;
struct dvb_net_priv *priv; struct dvb_net_priv *priv;
int result; int result;
int if_num; int if_num;
...@@ -503,25 +500,20 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid) ...@@ -503,25 +500,20 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid)
if ((if_num = get_if(dvbnet)) < 0) if ((if_num = get_if(dvbnet)) < 0)
return -EINVAL; return -EINVAL;
net=&dvbnet->device[if_num]; net = alloc_netdev(sizeof(struct dvb_net_priv), "dvb",
demux=dvbnet->demux; dvb_net_setup);
if (!net)
return -ENOMEM;
memset(net, 0, sizeof(struct net_device)); sprintf(net->name, "dvb%d_%d", dvbnet->dvbdev->adapter->num, if_num);
memcpy(net->name, "dvb0_0", 7); net->addr_len = 6;
net->name[3] = dvbnet->dvbdev->adapter->num + '0';
net->name[5] = if_num + '0';
net->addr_len = 6;
memcpy(net->dev_addr, dvbnet->dvbdev->adapter->proposed_mac, 6); memcpy(net->dev_addr, dvbnet->dvbdev->adapter->proposed_mac, 6);
net->next = NULL;
net->init = dvb_net_init_dev;
if (!(net->priv = kmalloc(sizeof(struct dvb_net_priv), GFP_KERNEL)))
return -ENOMEM;
dvbnet->device[if_num] = net;
priv = net->priv; priv = net->priv;
memset(priv, 0, sizeof(struct dvb_net_priv)); priv->demux = dvbnet->demux;
priv->demux = demux;
priv->pid = pid; priv->pid = pid;
priv->rx_mode = RX_MODE_UNI; priv->rx_mode = RX_MODE_UNI;
...@@ -531,6 +523,7 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid) ...@@ -531,6 +523,7 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid)
net->base_addr = pid; net->base_addr = pid;
if ((result = register_netdev(net)) < 0) { if ((result = register_netdev(net)) < 0) {
kfree(net);
return result; return result;
} }
...@@ -540,18 +533,20 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid) ...@@ -540,18 +533,20 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid)
static int dvb_net_remove_if(struct dvb_net *dvbnet, int num) static int dvb_net_remove_if(struct dvb_net *dvbnet, int num)
{ {
struct dvb_net_priv *priv = dvbnet->device[num].priv; struct net_device *net = dvbnet->device[num];
struct dvb_net_priv *priv = net->priv;
if (!dvbnet->state[num]) if (!dvbnet->state[num])
return -EINVAL; return -EINVAL;
if (priv->in_use) if (priv->in_use)
return -EBUSY; return -EBUSY;
dvb_net_stop(&dvbnet->device[num]); dvb_net_stop(net);
flush_scheduled_work(); flush_scheduled_work();
kfree(priv); unregister_netdev(net);
unregister_netdev(&dvbnet->device[num]);
dvbnet->state[num]=0; dvbnet->state[num]=0;
free_netdev(net);
return 0; return 0;
} }
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
struct dvb_net { struct dvb_net {
struct dvb_device *dvbdev; struct dvb_device *dvbdev;
struct net_device device[DVB_NET_DEVICES_MAX]; struct net_device *device[DVB_NET_DEVICES_MAX];
int state[DVB_NET_DEVICES_MAX]; int state[DVB_NET_DEVICES_MAX];
struct dmx_demux *demux; struct dmx_demux *demux;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment