---

yaml --- r: 241804 b: refs/heads/master c: cce33c3 h: refs/heads/master v: v3
git-mirror · Mar 21, 2011 · 0bda45f · 0bda45f
1 parent 20501e9
commit 0bda45f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b7c41ef33f38c88dcf9a1b7544d9e4eaa045e6f
+refs/heads/master: cce33c34937dec038567681d4755e75affed9742
diff --git a/trunk/drivers/media/dvb/ngene/ngene-core.c b/trunk/drivers/media/dvb/ngene/ngene-core.c
@@ -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);

diff --git a/trunk/drivers/media/dvb/ngene/ngene.h b/trunk/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;