From: Ralph Metzler <rjkm@xxxxxxxxxxxxxx>
Add dvb net device.
Note that the physical address must be setup manually.
Signed-off-by: Ralph Metzler <rjkm@xxxxxxxxxxxxxx>
Signed-off-by: Oliver Endriss <o.endriss@xxxxxx>
---
drivers/media/dvb/ngene/ngene-core.c | 3 +++
drivers/media/dvb/ngene/ngene.h | 2 ++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index 672f7fe..b370bd2 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -1450,6 +1450,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);
@@ -1503,6 +1504,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);
diff --git a/drivers/media/dvb/ngene/ngene.h b/drivers/media/dvb/ngene/ngene.h
index c1bb810..5894abd 100644
--- a/drivers/media/dvb/ngene/ngene.h
+++ b/drivers/media/dvb/ngene/ngene.h
@@ -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;
--
1.6.5.3
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
