V4L/DVB (7512): media/dvb/dvb-core replace remaining __FUNCTION__ occurrences (46b4f7c1) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/media/dvb/dvb-core/dmxdev.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -126,7 +126,7 @@ static int dvb_dvr_open(struct inode inode, struct file file)
	struct dmxdev *dmxdev = dvbdev->priv;		struct dmxdev *dmxdev = dvbdev->priv;
	struct dmx_frontend *front;		struct dmx_frontend *front;

	dprintk("function : %s\n", __FUNCTION__);		dprintk("function : %s\n", __func__);

	if (mutex_lock_interruptible(&dmxdev->mutex))		if (mutex_lock_interruptible(&dmxdev->mutex))
	return -ERESTARTSYS;		return -ERESTARTSYS;
	@@ -551,7 +551,7 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
	dvb_dmxdev_section_callback);		dvb_dmxdev_section_callback);
	if (ret < 0) {		if (ret < 0) {
	printk("DVB (%s): could not alloc feed\n",		printk("DVB (%s): could not alloc feed\n",
	__FUNCTION__);		__func__);
	return ret;		return ret;
	}		}

	@@ -559,7 +559,7 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
	(para->flags & DMX_CHECK_CRC) ? 1 : 0);		(para->flags & DMX_CHECK_CRC) ? 1 : 0);
	if (ret < 0) {		if (ret < 0) {
	printk("DVB (%s): could not set feed\n",		printk("DVB (%s): could not set feed\n",
	__FUNCTION__);		__func__);
	dvb_dmxdev_feed_restart(filter);		dvb_dmxdev_feed_restart(filter);
	return ret;		return ret;
	}		}
	@@ -734,7 +734,7 @@ static int dvb_dmxdev_filter_set(struct dmxdev *dmxdev,
	struct dmxdev_filter *dmxdevfilter,		struct dmxdev_filter *dmxdevfilter,
	struct dmx_sct_filter_params *params)		struct dmx_sct_filter_params *params)
	{		{
	dprintk("function : %s\n", __FUNCTION__);		dprintk("function : %s\n", __func__);

	dvb_dmxdev_filter_stop(dmxdevfilter);		dvb_dmxdev_filter_stop(dmxdevfilter);

	@@ -1040,7 +1040,7 @@ static unsigned int dvb_dvr_poll(struct file file, poll_table wait)
	struct dmxdev *dmxdev = dvbdev->priv;		struct dmxdev *dmxdev = dvbdev->priv;
	unsigned int mask = 0;		unsigned int mask = 0;

	dprintk("function : %s\n", __FUNCTION__);		dprintk("function : %s\n", __func__);

	poll_wait(file, &dmxdev->dvr_buffer.queue, wait);		poll_wait(file, &dmxdev->dvr_buffer.queue, wait);

drivers/media/dvb/dvb-core/dvb_ca_en50221.c

+18 −18

Original line number	Original line	Diff line number	Diff line
	@@ -250,7 +250,7 @@ static int dvb_ca_en50221_wait_if_status(struct dvb_ca_private *ca, int slot,
	unsigned long timeout;		unsigned long timeout;
	unsigned long start;		unsigned long start;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	/* loop until timeout elapsed */		/* loop until timeout elapsed */
	start = jiffies;		start = jiffies;
	@@ -263,7 +263,7 @@ static int dvb_ca_en50221_wait_if_status(struct dvb_ca_private *ca, int slot,

	/* if we got the flags, it was successful! */		/* if we got the flags, it was successful! */
	if (res & waitfor) {		if (res & waitfor) {
	dprintk("%s succeeded timeout:%lu\n", __FUNCTION__, jiffies - start);		dprintk("%s succeeded timeout:%lu\n", __func__, jiffies - start);
	return 0;		return 0;
	}		}

	@@ -276,7 +276,7 @@ static int dvb_ca_en50221_wait_if_status(struct dvb_ca_private *ca, int slot,
	msleep(1);		msleep(1);
	}		}

	dprintk("%s failed timeout:%lu\n", __FUNCTION__, jiffies - start);		dprintk("%s failed timeout:%lu\n", __func__, jiffies - start);

	/* if we get here, we've timed out */		/* if we get here, we've timed out */
	return -ETIMEDOUT;		return -ETIMEDOUT;
	@@ -297,7 +297,7 @@ static int dvb_ca_en50221_link_init(struct dvb_ca_private *ca, int slot)
	int buf_size;		int buf_size;
	u8 buf[2];		u8 buf[2];

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	/* we'll be determining these during this function */		/* we'll be determining these during this function */
	ca->slot_info[slot].da_irq_supported = 0;		ca->slot_info[slot].da_irq_supported = 0;
	@@ -549,7 +549,7 @@ static int dvb_ca_en50221_set_configoption(struct dvb_ca_private *ca, int slot)
	{		{
	int configoption;		int configoption;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	/* set the config option */		/* set the config option */
	ca->pub->write_attribute_mem(ca->pub, slot,		ca->pub->write_attribute_mem(ca->pub, slot,
	@@ -587,7 +587,7 @@ static int dvb_ca_en50221_read_data(struct dvb_ca_private ca, int slot, u8 eb
	u8 buf[HOST_LINK_BUF_SIZE];		u8 buf[HOST_LINK_BUF_SIZE];
	int i;		int i;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	/* check if we have space for a link buf in the rx_buffer */		/* check if we have space for a link buf in the rx_buffer */
	if (ebuf == NULL) {		if (ebuf == NULL) {
	@@ -708,7 +708,7 @@ static int dvb_ca_en50221_write_data(struct dvb_ca_private ca, int slot, u8 b
	int status;		int status;
	int i;		int i;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);


	// sanity check		// sanity check
	@@ -785,7 +785,7 @@ EXPORT_SYMBOL(dvb_ca_en50221_camchange_irq);
	*/		*/
	static int dvb_ca_en50221_slot_shutdown(struct dvb_ca_private *ca, int slot)		static int dvb_ca_en50221_slot_shutdown(struct dvb_ca_private *ca, int slot)
	{		{
	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	ca->pub->slot_shutdown(ca->pub, slot);		ca->pub->slot_shutdown(ca->pub, slot);
	ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;		ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;
	@@ -892,7 +892,7 @@ void dvb_ca_en50221_frda_irq(struct dvb_ca_en50221 *pubca, int slot)
	static void dvb_ca_en50221_thread_wakeup(struct dvb_ca_private *ca)		static void dvb_ca_en50221_thread_wakeup(struct dvb_ca_private *ca)
	{		{

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	ca->wakeup = 1;		ca->wakeup = 1;
	mb();		mb();
	@@ -964,7 +964,7 @@ static int dvb_ca_en50221_thread(void *data)
	int pktcount;		int pktcount;
	void *rxbuf;		void *rxbuf;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	/* choose the correct initial delay */		/* choose the correct initial delay */
	dvb_ca_en50221_thread_update_delay(ca);		dvb_ca_en50221_thread_update_delay(ca);
	@@ -1172,7 +1172,7 @@ static int dvb_ca_en50221_io_do_ioctl(struct inode inode, struct file file,
	int err = 0;		int err = 0;
	int slot;		int slot;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	switch (cmd) {		switch (cmd) {
	case CA_RESET:		case CA_RESET:
	@@ -1266,7 +1266,7 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file,
	unsigned long timeout;		unsigned long timeout;
	int written;		int written;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	/* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */		/* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
	if (count < 2)		if (count < 2)
	@@ -1401,7 +1401,7 @@ static ssize_t dvb_ca_en50221_io_read(struct file file, char __user buf,
	int pktlen;		int pktlen;
	int dispose = 0;		int dispose = 0;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	/* Outgoing packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */		/* Outgoing packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
	if (count < 2)		if (count < 2)
	@@ -1490,7 +1490,7 @@ static int dvb_ca_en50221_io_open(struct inode inode, struct file file)
	int err;		int err;
	int i;		int i;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	if (!try_module_get(ca->pub->owner))		if (!try_module_get(ca->pub->owner))
	return -EIO;		return -EIO;
	@@ -1534,7 +1534,7 @@ static int dvb_ca_en50221_io_release(struct inode inode, struct file file)
	struct dvb_ca_private *ca = dvbdev->priv;		struct dvb_ca_private *ca = dvbdev->priv;
	int err;		int err;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	/* mark the CA device as closed */		/* mark the CA device as closed */
	ca->open = 0;		ca->open = 0;
	@@ -1564,7 +1564,7 @@ static unsigned int dvb_ca_en50221_io_poll(struct file file, poll_table wait)
	int slot;		int slot;
	int result = 0;		int result = 0;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1) {		if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1) {
	mask \|= POLLIN;		mask \|= POLLIN;
	@@ -1626,7 +1626,7 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,
	struct dvb_ca_private *ca = NULL;		struct dvb_ca_private *ca = NULL;
	int i;		int i;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	if (slot_count < 1)		if (slot_count < 1)
	return -EINVAL;		return -EINVAL;
	@@ -1704,7 +1704,7 @@ void dvb_ca_en50221_release(struct dvb_ca_en50221 *pubca)
	struct dvb_ca_private *ca = pubca->private;		struct dvb_ca_private *ca = pubca->private;
	int i;		int i;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	/* shutdown the thread if there was one */		/* shutdown the thread if there was one */
	kthread_stop(ca->thread);		kthread_stop(ca->thread);

drivers/media/dvb/dvb-core/dvb_demux.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -553,7 +553,7 @@ static void dvb_demux_feed_add(struct dvb_demux_feed *feed)
	spin_lock_irq(&feed->demux->lock);		spin_lock_irq(&feed->demux->lock);
	if (dvb_demux_feed_find(feed)) {		if (dvb_demux_feed_find(feed)) {
	printk(KERN_ERR "%s: feed already in list (type=%x state=%x pid=%x)\n",		printk(KERN_ERR "%s: feed already in list (type=%x state=%x pid=%x)\n",
	__FUNCTION__, feed->type, feed->state, feed->pid);		__func__, feed->type, feed->state, feed->pid);
	goto out;		goto out;
	}		}

	@@ -567,7 +567,7 @@ static void dvb_demux_feed_del(struct dvb_demux_feed *feed)
	spin_lock_irq(&feed->demux->lock);		spin_lock_irq(&feed->demux->lock);
	if (!(dvb_demux_feed_find(feed))) {		if (!(dvb_demux_feed_find(feed))) {
	printk(KERN_ERR "%s: feed not in list (type=%x state=%x pid=%x)\n",		printk(KERN_ERR "%s: feed not in list (type=%x state=%x pid=%x)\n",
	__FUNCTION__, feed->type, feed->state, feed->pid);		__func__, feed->type, feed->state, feed->pid);
	goto out;		goto out;
	}		}

drivers/media/dvb/dvb-core/dvb_frontend.c

+15 −15

Original line number	Original line	Diff line number	Diff line
	@@ -135,7 +135,7 @@ static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status)
	struct dvb_frontend_event *e;		struct dvb_frontend_event *e;
	int wp;		int wp;

	dprintk ("%s\n", __FUNCTION__);		dprintk ("%s\n", __func__);

	if (mutex_lock_interruptible (&events->mtx))		if (mutex_lock_interruptible (&events->mtx))
	return;		return;
	@@ -171,7 +171,7 @@ static int dvb_frontend_get_event(struct dvb_frontend *fe,
	struct dvb_frontend_private *fepriv = fe->frontend_priv;		struct dvb_frontend_private *fepriv = fe->frontend_priv;
	struct dvb_fe_events *events = &fepriv->events;		struct dvb_fe_events *events = &fepriv->events;

	dprintk ("%s\n", __FUNCTION__);		dprintk ("%s\n", __func__);

	if (events->overflow) {		if (events->overflow) {
	events->overflow = 0;		events->overflow = 0;
	@@ -237,7 +237,7 @@ static void dvb_frontend_swzigzag_update_delay(struct dvb_frontend_private *fepr
	{		{
	int q2;		int q2;

	dprintk ("%s\n", __FUNCTION__);		dprintk ("%s\n", __func__);

	if (locked)		if (locked)
	(fepriv->quality) = (fepriv->quality * 220 + 36*256) / 256;		(fepriv->quality) = (fepriv->quality * 220 + 36*256) / 256;
	@@ -329,7 +329,7 @@ static int dvb_frontend_swzigzag_autotune(struct dvb_frontend *fe, int check_wra

	dprintk("%s: drift:%i inversion:%i auto_step:%i "		dprintk("%s: drift:%i inversion:%i auto_step:%i "
	"auto_sub_step:%i started_auto_step:%i\n",		"auto_sub_step:%i started_auto_step:%i\n",
	__FUNCTION__, fepriv->lnb_drift, fepriv->inversion,		__func__, fepriv->lnb_drift, fepriv->inversion,
	fepriv->auto_step, fepriv->auto_sub_step, fepriv->started_auto_step);		fepriv->auto_step, fepriv->auto_sub_step, fepriv->started_auto_step);

	/* set the frontend itself */		/* set the frontend itself */
	@@ -511,7 +511,7 @@ static int dvb_frontend_thread(void *data)
	fe_status_t s;		fe_status_t s;
	struct dvb_frontend_parameters *params;		struct dvb_frontend_parameters *params;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);

	fepriv->check_wrapped = 0;		fepriv->check_wrapped = 0;
	fepriv->quality = 0;		fepriv->quality = 0;
	@@ -597,7 +597,7 @@ static void dvb_frontend_stop(struct dvb_frontend *fe)
	{		{
	struct dvb_frontend_private *fepriv = fe->frontend_priv;		struct dvb_frontend_private *fepriv = fe->frontend_priv;

	dprintk ("%s\n", __FUNCTION__);		dprintk ("%s\n", __func__);

	fepriv->exit = 1;		fepriv->exit = 1;
	mb();		mb();
	@@ -665,7 +665,7 @@ static int dvb_frontend_start(struct dvb_frontend *fe)
	struct dvb_frontend_private *fepriv = fe->frontend_priv;		struct dvb_frontend_private *fepriv = fe->frontend_priv;
	struct task_struct *fe_thread;		struct task_struct *fe_thread;

	dprintk ("%s\n", __FUNCTION__);		dprintk ("%s\n", __func__);

	if (fepriv->thread) {		if (fepriv->thread) {
	if (!fepriv->exit)		if (!fepriv->exit)
	@@ -763,7 +763,7 @@ static int dvb_frontend_ioctl(struct inode inode, struct file file,
	struct dvb_frontend_private *fepriv = fe->frontend_priv;		struct dvb_frontend_private *fepriv = fe->frontend_priv;
	int err = -EOPNOTSUPP;		int err = -EOPNOTSUPP;

	dprintk ("%s\n", __FUNCTION__);		dprintk ("%s\n", __func__);

	if (fepriv->exit)		if (fepriv->exit)
	return -ENODEV;		return -ENODEV;
	@@ -895,7 +895,7 @@ static int dvb_frontend_ioctl(struct inode inode, struct file file,
	int i;		int i;
	u8 last = 1;		u8 last = 1;
	if (dvb_frontend_debug)		if (dvb_frontend_debug)
	printk("%s switch command: 0x%04lx\n", __FUNCTION__, cmd);		printk("%s switch command: 0x%04lx\n", __func__, cmd);
	do_gettimeofday(&nexttime);		do_gettimeofday(&nexttime);
	if (dvb_frontend_debug)		if (dvb_frontend_debug)
	memcpy(&tv[0], &nexttime, sizeof(struct timeval));		memcpy(&tv[0], &nexttime, sizeof(struct timeval));
	@@ -919,7 +919,7 @@ static int dvb_frontend_ioctl(struct inode inode, struct file file,
	}		}
	if (dvb_frontend_debug) {		if (dvb_frontend_debug) {
	printk("%s(%d): switch delay (should be 32k followed by all 8k\n",		printk("%s(%d): switch delay (should be 32k followed by all 8k\n",
	__FUNCTION__, fe->dvb->num);		__func__, fe->dvb->num);
	for (i = 1; i < 10; i++)		for (i = 1; i < 10; i++)
	printk("%d: %d\n", i, timeval_usec_diff(tv[i-1] , tv[i]));		printk("%d: %d\n", i, timeval_usec_diff(tv[i-1] , tv[i]));
	}		}
	@@ -1037,7 +1037,7 @@ static unsigned int dvb_frontend_poll(struct file *file, struct poll_table_struc
	struct dvb_frontend *fe = dvbdev->priv;		struct dvb_frontend *fe = dvbdev->priv;
	struct dvb_frontend_private *fepriv = fe->frontend_priv;		struct dvb_frontend_private *fepriv = fe->frontend_priv;

	dprintk ("%s\n", __FUNCTION__);		dprintk ("%s\n", __func__);

	poll_wait (file, &fepriv->events.wait_queue, wait);		poll_wait (file, &fepriv->events.wait_queue, wait);

	@@ -1054,7 +1054,7 @@ static int dvb_frontend_open(struct inode inode, struct file file)
	struct dvb_frontend_private *fepriv = fe->frontend_priv;		struct dvb_frontend_private *fepriv = fe->frontend_priv;
	int ret;		int ret;

	dprintk ("%s\n", __FUNCTION__);		dprintk ("%s\n", __func__);

	if (dvbdev->users == -1 && fe->ops.ts_bus_ctrl) {		if (dvbdev->users == -1 && fe->ops.ts_bus_ctrl) {
	if ((ret = fe->ops.ts_bus_ctrl(fe, 1)) < 0)		if ((ret = fe->ops.ts_bus_ctrl(fe, 1)) < 0)
	@@ -1095,7 +1095,7 @@ static int dvb_frontend_release(struct inode inode, struct file file)
	struct dvb_frontend_private *fepriv = fe->frontend_priv;		struct dvb_frontend_private *fepriv = fe->frontend_priv;
	int ret;		int ret;

	dprintk ("%s\n", __FUNCTION__);		dprintk ("%s\n", __func__);

	if ((file->f_flags & O_ACCMODE) != O_RDONLY)		if ((file->f_flags & O_ACCMODE) != O_RDONLY)
	fepriv->release_jiffies = jiffies;		fepriv->release_jiffies = jiffies;
	@@ -1135,7 +1135,7 @@ int dvb_register_frontend(struct dvb_adapter* dvb,
	.kernel_ioctl = dvb_frontend_ioctl		.kernel_ioctl = dvb_frontend_ioctl
	};		};

	dprintk ("%s\n", __FUNCTION__);		dprintk ("%s\n", __func__);

	if (mutex_lock_interruptible(&frontend_mutex))		if (mutex_lock_interruptible(&frontend_mutex))
	return -ERESTARTSYS;		return -ERESTARTSYS;
	@@ -1169,7 +1169,7 @@ EXPORT_SYMBOL(dvb_register_frontend);
	int dvb_unregister_frontend(struct dvb_frontend* fe)		int dvb_unregister_frontend(struct dvb_frontend* fe)
	{		{
	struct dvb_frontend_private *fepriv = fe->frontend_priv;		struct dvb_frontend_private *fepriv = fe->frontend_priv;
	dprintk ("%s\n", __FUNCTION__);		dprintk ("%s\n", __func__);

	mutex_lock(&frontend_mutex);		mutex_lock(&frontend_mutex);
	dvb_frontend_stop (fe);		dvb_frontend_stop (fe);

drivers/media/dvb/dvb-core/dvb_net.c

+15 −15

Original line number	Original line	Diff line number	Diff line
	@@ -965,17 +965,17 @@ static int dvb_net_feed_start(struct net_device *dev)
	struct dmx_demux *demux = priv->demux;		struct dmx_demux *demux = priv->demux;
	unsigned char mac = (unsigned char ) dev->dev_addr;		unsigned char mac = (unsigned char ) dev->dev_addr;

	dprintk("%s: rx_mode %i\n", __FUNCTION__, priv->rx_mode);		dprintk("%s: rx_mode %i\n", __func__, priv->rx_mode);
	mutex_lock(&priv->mutex);		mutex_lock(&priv->mutex);
	if (priv->tsfeed \|\| priv->secfeed \|\| priv->secfilter \|\| priv->multi_secfilter[0])		if (priv->tsfeed \|\| priv->secfeed \|\| priv->secfilter \|\| priv->multi_secfilter[0])
	printk("%s: BUG %d\n", __FUNCTION__, __LINE__);		printk("%s: BUG %d\n", __func__, __LINE__);

	priv->secfeed=NULL;		priv->secfeed=NULL;
	priv->secfilter=NULL;		priv->secfilter=NULL;
	priv->tsfeed = NULL;		priv->tsfeed = NULL;

	if (priv->feedtype == DVB_NET_FEEDTYPE_MPE) {		if (priv->feedtype == DVB_NET_FEEDTYPE_MPE) {
	dprintk("%s: alloc secfeed\n", __FUNCTION__);		dprintk("%s: alloc secfeed\n", __func__);
	ret=demux->allocate_section_feed(demux, &priv->secfeed,		ret=demux->allocate_section_feed(demux, &priv->secfeed,
	dvb_net_sec_callback);		dvb_net_sec_callback);
	if (ret<0) {		if (ret<0) {
	@@ -993,38 +993,38 @@ static int dvb_net_feed_start(struct net_device *dev)
	}		}

	if (priv->rx_mode != RX_MODE_PROMISC) {		if (priv->rx_mode != RX_MODE_PROMISC) {
	dprintk("%s: set secfilter\n", __FUNCTION__);		dprintk("%s: set secfilter\n", __func__);
	dvb_net_filter_sec_set(dev, &priv->secfilter, mac, mask_normal);		dvb_net_filter_sec_set(dev, &priv->secfilter, mac, mask_normal);
	}		}

	switch (priv->rx_mode) {		switch (priv->rx_mode) {
	case RX_MODE_MULTI:		case RX_MODE_MULTI:
	for (i = 0; i < priv->multi_num; i++) {		for (i = 0; i < priv->multi_num; i++) {
	dprintk("%s: set multi_secfilter[%d]\n", __FUNCTION__, i);		dprintk("%s: set multi_secfilter[%d]\n", __func__, i);
	dvb_net_filter_sec_set(dev, &priv->multi_secfilter[i],		dvb_net_filter_sec_set(dev, &priv->multi_secfilter[i],
	priv->multi_macs[i], mask_normal);		priv->multi_macs[i], mask_normal);
	}		}
	break;		break;
	case RX_MODE_ALL_MULTI:		case RX_MODE_ALL_MULTI:
	priv->multi_num=1;		priv->multi_num=1;
	dprintk("%s: set multi_secfilter[0]\n", __FUNCTION__);		dprintk("%s: set multi_secfilter[0]\n", __func__);
	dvb_net_filter_sec_set(dev, &priv->multi_secfilter[0],		dvb_net_filter_sec_set(dev, &priv->multi_secfilter[0],
	mac_allmulti, mask_allmulti);		mac_allmulti, mask_allmulti);
	break;		break;
	case RX_MODE_PROMISC:		case RX_MODE_PROMISC:
	priv->multi_num=0;		priv->multi_num=0;
	dprintk("%s: set secfilter\n", __FUNCTION__);		dprintk("%s: set secfilter\n", __func__);
	dvb_net_filter_sec_set(dev, &priv->secfilter, mac, mask_promisc);		dvb_net_filter_sec_set(dev, &priv->secfilter, mac, mask_promisc);
	break;		break;
	}		}

	dprintk("%s: start filtering\n", __FUNCTION__);		dprintk("%s: start filtering\n", __func__);
	priv->secfeed->start_filtering(priv->secfeed);		priv->secfeed->start_filtering(priv->secfeed);
	} else if (priv->feedtype == DVB_NET_FEEDTYPE_ULE) {		} else if (priv->feedtype == DVB_NET_FEEDTYPE_ULE) {
	struct timespec timeout = { 0, 10000000 }; // 10 msec		struct timespec timeout = { 0, 10000000 }; // 10 msec

	/* we have payloads encapsulated in TS */		/* we have payloads encapsulated in TS */
	dprintk("%s: alloc tsfeed\n", __FUNCTION__);		dprintk("%s: alloc tsfeed\n", __func__);
	ret = demux->allocate_ts_feed(demux, &priv->tsfeed, dvb_net_ts_callback);		ret = demux->allocate_ts_feed(demux, &priv->tsfeed, dvb_net_ts_callback);
	if (ret < 0) {		if (ret < 0) {
	printk("%s: could not allocate ts feed\n", dev->name);		printk("%s: could not allocate ts feed\n", dev->name);
	@@ -1048,7 +1048,7 @@ static int dvb_net_feed_start(struct net_device *dev)
	goto error;		goto error;
	}		}

	dprintk("%s: start filtering\n", __FUNCTION__);		dprintk("%s: start filtering\n", __func__);
	priv->tsfeed->start_filtering(priv->tsfeed);		priv->tsfeed->start_filtering(priv->tsfeed);
	} else		} else
	ret = -EINVAL;		ret = -EINVAL;
	@@ -1063,17 +1063,17 @@ static int dvb_net_feed_stop(struct net_device *dev)
	struct dvb_net_priv *priv = dev->priv;		struct dvb_net_priv *priv = dev->priv;
	int i, ret = 0;		int i, ret = 0;

	dprintk("%s\n", __FUNCTION__);		dprintk("%s\n", __func__);
	mutex_lock(&priv->mutex);		mutex_lock(&priv->mutex);
	if (priv->feedtype == DVB_NET_FEEDTYPE_MPE) {		if (priv->feedtype == DVB_NET_FEEDTYPE_MPE) {
	if (priv->secfeed) {		if (priv->secfeed) {
	if (priv->secfeed->is_filtering) {		if (priv->secfeed->is_filtering) {
	dprintk("%s: stop secfeed\n", __FUNCTION__);		dprintk("%s: stop secfeed\n", __func__);
	priv->secfeed->stop_filtering(priv->secfeed);		priv->secfeed->stop_filtering(priv->secfeed);
	}		}

	if (priv->secfilter) {		if (priv->secfilter) {
	dprintk("%s: release secfilter\n", __FUNCTION__);		dprintk("%s: release secfilter\n", __func__);
	priv->secfeed->release_filter(priv->secfeed,		priv->secfeed->release_filter(priv->secfeed,
	priv->secfilter);		priv->secfilter);
	priv->secfilter=NULL;		priv->secfilter=NULL;
	@@ -1082,7 +1082,7 @@ static int dvb_net_feed_stop(struct net_device *dev)
	for (i=0; i<priv->multi_num; i++) {		for (i=0; i<priv->multi_num; i++) {
	if (priv->multi_secfilter[i]) {		if (priv->multi_secfilter[i]) {
	dprintk("%s: release multi_filter[%d]\n",		dprintk("%s: release multi_filter[%d]\n",
	__FUNCTION__, i);		__func__, i);
	priv->secfeed->release_filter(priv->secfeed,		priv->secfeed->release_filter(priv->secfeed,
	priv->multi_secfilter[i]);		priv->multi_secfilter[i]);
	priv->multi_secfilter[i] = NULL;		priv->multi_secfilter[i] = NULL;
	@@ -1096,7 +1096,7 @@ static int dvb_net_feed_stop(struct net_device *dev)
	} else if (priv->feedtype == DVB_NET_FEEDTYPE_ULE) {		} else if (priv->feedtype == DVB_NET_FEEDTYPE_ULE) {
	if (priv->tsfeed) {		if (priv->tsfeed) {
	if (priv->tsfeed->is_filtering) {		if (priv->tsfeed->is_filtering) {
	dprintk("%s: stop tsfeed\n", __FUNCTION__);		dprintk("%s: stop tsfeed\n", __func__);
	priv->tsfeed->stop_filtering(priv->tsfeed);		priv->tsfeed->stop_filtering(priv->tsfeed);
	}		}
	priv->demux->release_ts_feed(priv->demux, priv->tsfeed);		priv->demux->release_ts_feed(priv->demux, priv->tsfeed);