X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fdvb%2Fdvb-core%2Fdvb_net.c;h=dfa5be4e2be2db620d162d3ece359841b7b3b587;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=e77dd2dd74223c534090e6ae428c74c21bc69fa1;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c
index e77dd2dd7..dfa5be4e2 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb/dvb-core/dvb_net.c
@@ -43,7 +43,7 @@
 #include "dvb_functions.h"
 
 
-static inline __u32 iov_crc32( __u32 c, struct iovec *iov, unsigned int cnt )
+static inline __u32 iov_crc32( __u32 c, struct kvec *iov, unsigned int cnt )
 {
 	unsigned int j;
 	for (j = 0; j < cnt; j++)
@@ -481,7 +481,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
 			/* Check CRC32, we've got it in our skb already. */
 			unsigned short ulen = htons(priv->ule_sndu_len);
 			unsigned short utype = htons(priv->ule_sndu_type);
-			struct iovec iov[4] = {
+			struct kvec iov[4] = {
 				{ &ulen, sizeof ulen },
 				{ &utype, sizeof utype },
 				{ NULL, 0 },
@@ -677,7 +677,7 @@ static int dvb_net_filter_sec_set(struct net_device *dev,
 	struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
 	int ret;
 
-	*secfilter=0;
+	*secfilter=NULL;
 	ret = priv->secfeed->allocate_filter(priv->secfeed, secfilter);
 	if (ret<0) {
 		printk("%s: could not get filter\n", dev->name);
@@ -726,9 +726,9 @@ static int dvb_net_feed_start(struct net_device *dev)
 	if (priv->secfeed || priv->secfilter || priv->multi_secfilter[0])
 		printk("%s: BUG %d\n", __FUNCTION__, __LINE__);
 
-	priv->secfeed=0;
-	priv->secfilter=0;
-	priv->tsfeed = 0;
+	priv->secfeed=NULL;
+	priv->secfilter=NULL;
+	priv->tsfeed = NULL;
 
 	if (priv->feedtype == DVB_NET_FEEDTYPE_MPE) {
 	dprintk("%s: alloc secfeed\n", __FUNCTION__);
@@ -744,7 +744,7 @@ static int dvb_net_feed_start(struct net_device *dev)
 	if (ret<0) {
 		printk("%s: could not set section feed\n", dev->name);
 		priv->demux->release_section_feed(priv->demux, priv->secfeed);
-		priv->secfeed=0;
+		priv->secfeed=NULL;
 		return ret;
 	}
 
@@ -799,7 +799,7 @@ static int dvb_net_feed_start(struct net_device *dev)
 		if (ret < 0) {
 			printk("%s: could not set ts feed\n", dev->name);
 			priv->demux->release_ts_feed(priv->demux, priv->tsfeed);
-			priv->tsfeed = 0;
+			priv->tsfeed = NULL;
 			return ret;
 		}
 
@@ -828,7 +828,7 @@ static int dvb_net_feed_stop(struct net_device *dev)
 			dprintk("%s: release secfilter\n", __FUNCTION__);
 			priv->secfeed->release_filter(priv->secfeed,
 					       priv->secfilter);
-		priv->secfilter=0;
+		priv->secfilter=NULL;
 		}
 
 		for (i=0; i<priv->multi_num; i++) {
@@ -837,12 +837,12 @@ static int dvb_net_feed_stop(struct net_device *dev)
 						__FUNCTION__, i);
 				priv->secfeed->release_filter(priv->secfeed,
 						       priv->multi_secfilter[i]);
-			priv->multi_secfilter[i]=0;
+			priv->multi_secfilter[i]=NULL;
 		}
 		}
 
 		priv->demux->release_section_feed(priv->demux, priv->secfeed);
-		priv->secfeed=0;
+		priv->secfeed=NULL;
 	} else
 		printk("%s: no feed to stop\n", dev->name);
 	} else if (priv->feedtype == DVB_NET_FEEDTYPE_ULE) {
@@ -852,7 +852,7 @@ static int dvb_net_feed_stop(struct net_device *dev)
 				priv->tsfeed->stop_filtering(priv->tsfeed);
 			}
 			priv->demux->release_ts_feed(priv->demux, priv->tsfeed);
-			priv->tsfeed = 0;
+			priv->tsfeed = NULL;
 		}
 		else
 			printk("%s: no ts feed to stop\n", dev->name);
@@ -1178,16 +1178,13 @@ static int dvb_net_ioctl(struct inode *inode, struct file *file,
 
 static struct file_operations dvb_net_fops = {
 	.owner = THIS_MODULE,
-        .read =	0,
-	.write = 0,
 	.ioctl = dvb_net_ioctl,
 	.open =	dvb_generic_open,
 	.release = dvb_generic_release,
-	.poll =	0,
 };
 
 static struct dvb_device dvbdev_net = {
-        .priv = 0,
+        .priv = NULL,
         .users = 1,
         .writers = 1,
         .fops = &dvb_net_fops,