Attachment #298785 for bug #397959

View | Details | Raw Unified | Return to bug 397959
Collapse All | Expand All

Line Link Here

(-)file_not_specified_in_diff (-2 / +4 lines)
0	-- drivers/dahdi/voicebus/GpakCust.h.orig 2012-01-12 17:49:10.000000000 +0100	0	++ drivers/dahdi/voicebus/GpakCust.h 2012-01-12 17:49:25.000000000 +0100
Lines 36-41 Link Here
36	#ifndef _GPAKCUST_H /* prevent multiple inclusion */	36	#ifndef _GPAKCUST_H /* prevent multiple inclusion */
37	#define _GPAKCUST_H	37	#define _GPAKCUST_H
38		38
		39	#include <linux/module.h>
39	#include <linux/device.h>	40	#include <linux/device.h>
40	#include <linux/completion.h>	41	#include <linux/completion.h>
41	#include <linux/workqueue.h>	42	#include <linux/workqueue.h>
42	-- include/dahdi/kernel.h.orig 2012-01-12 17:50:22.000000000 +0100	43	++ include/dahdi/kernel.h 2012-01-12 17:50:51.000000000 +0100
Lines 42-47 Link Here
42	#include <linux/config.h>	42	#include <linux/config.h>
43	#endif	43	#endif
44	#include <linux/fs.h>	44	#include <linux/fs.h>
		45	#include <linux/module.h>
45	#include <linux/kobject.h>	46	#include <linux/kobject.h>
46	#include <linux/ioctl.h>	47	#include <linux/ioctl.h>

Lines 474-479 Link Here

(-)drivers/dahdi/wctc4xxp/base.c.orig (+14 lines)
474	return cmd;	474	return cmd;
475	}	475	}
476		476
		477	#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
477	static void	478	static void
478	wctc4xxp_net_set_multi(struct net_device *netdev)	479	wctc4xxp_net_set_multi(struct net_device *netdev)
479	{	480	{
Lines 481-486 Link Here
481	DTE_DEBUG(DTE_DEBUG_GENERAL, "%s promiscuity:%d\n",	482	DTE_DEBUG(DTE_DEBUG_GENERAL, "%s promiscuity:%d\n",
482	__func__, netdev->promiscuity);	483	__func__, netdev->promiscuity);
483	}	484	}
		485	#else
		486	static void
		487	wctc4xxp_set_rx_mode(struct net_device *netdev)
		488	{
		489	struct wcdte *wc = wcdte_from_netdev(netdev);
		490	DTE_DEBUG(DTE_DEBUG_GENERAL, "%s promiscuity:%d\n",
		491	__func__, netdev->promiscuity);
		492	}
		493	#endif
484		494
485	static int	495	static int
486	wctc4xxp_net_up(struct net_device *netdev)	496	wctc4xxp_net_up(struct net_device *netdev)
Lines 644-650 Link Here
644		654
645	#ifdef HAVE_NET_DEVICE_OPS	655	#ifdef HAVE_NET_DEVICE_OPS
646	static const struct net_device_ops wctc4xxp_netdev_ops = {	656	static const struct net_device_ops wctc4xxp_netdev_ops = {
		657	#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
647	.ndo_set_multicast_list = &wctc4xxp_net_set_multi,	658	.ndo_set_multicast_list = &wctc4xxp_net_set_multi,
		659	#else
		660	.ndo_set_rx_mode = &wctc4xxp_set_rx_mode,
		661	#endif
648	.ndo_open = &wctc4xxp_net_up,	662	.ndo_open = &wctc4xxp_net_up,
649	.ndo_stop = &wctc4xxp_net_down,	663	.ndo_stop = &wctc4xxp_net_down,
650	.ndo_start_xmit = &wctc4xxp_net_hard_start_xmit,	664	.ndo_start_xmit = &wctc4xxp_net_hard_start_xmit,

Return to bug 397959