[media] ngene: Add net device
authorRalph Metzler <rjkm@metzlerbros.de>
Mon, 10 Jan 2011 09:36:17 +0000 (06:36 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 21 Mar 2011 23:31:45 +0000 (20:31 -0300)
Add dvb net device.
Note that the physical address must be setup manually.

Signed-off-by: Ralph Metzler <rjkm@metzlerbros.de>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/ngene/ngene-core.c
drivers/media/dvb/ngene/ngene.h

index 422f83b9dca1f7c5a024ac00d730403822fae92f..6a097e44a4a8bf272168b88eccc63322c8f5772b 100644 (file)
@@ -1451,6 +1451,7 @@ static void release_channel(struct ngene_channel *chan)
                        dvb_frontend_detach(chan->fe);
                        chan->fe = NULL;
                }
+               dvb_net_release(&chan->dvbnet);
                dvbdemux->dmx.close(&dvbdemux->dmx);
                dvbdemux->dmx.remove_frontend(&dvbdemux->dmx,
                                              &chan->hw_frontend);
@@ -1504,6 +1505,8 @@ static int init_channel(struct ngene_channel *chan)
                ret = my_dvb_dmxdev_ts_card_init(&chan->dmxdev, &chan->demux,
                                                 &chan->hw_frontend,
                                                 &chan->mem_frontend, adapter);
+               ret = dvb_net_init(adapter, &chan->dvbnet, &chan->demux.dmx);
+
                if (dev->ci.en && (io&NGENE_IO_TSOUT)) {
                        dvb_ca_en50221_init(adapter, dev->ci.en, 0, 1);
                        set_transfer(chan, 1);
index c1bb81014fb461fc948144af122f28497678ff34..5894abd91af5db6097dade02a49b9b46820978b3 100644 (file)
@@ -39,6 +39,7 @@
 #include "dvb_ca_en50221.h"
 #include "dvb_frontend.h"
 #include "dvb_ringbuffer.h"
+#include "dvb_net.h"
 #include "cxd2099.h"
 
 #define DEVICE_NAME "ngene"
@@ -642,6 +643,7 @@ struct ngene_channel {
        struct dvb_frontend  *fe;
        struct dmxdev         dmxdev;
        struct dvb_demux      demux;
+       struct dvb_net        dvbnet;
        struct dmx_frontend   hw_frontend;
        struct dmx_frontend   mem_frontend;
        int                   users;