Attachment #197686 for bug #277552




};
#endif 

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
static const struct net_device_ops wl_net_device_ops =
{
	.ndo_open = wl_open,
	.ndo_stop = wl_close,
	.ndo_start_xmit = wl_start,
	.ndo_get_stats = wl_get_stats,
	.ndo_set_mac_address = wl_set_mac_address,
	.ndo_set_multicast_list = wl_set_multicast_list,
	.ndo_do_ioctl = wl_ioctl,
};
#endif

static
void wl_if_setup(struct net_device *dev)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
	dev->open = wl_open;
	dev->stop = wl_close;
	dev->hard_start_xmit = wl_start;

	dev->set_mac_address = wl_set_mac_address;
	dev->set_multicast_list = wl_set_multicast_list;
	dev->do_ioctl = wl_ioctl;
#else
	dev->netdev_ops = &wl_net_device_ops;
#endif
#ifdef CONFIG_WIRELESS_EXT
#if WIRELESS_EXT < 19
	dev->get_wireless_stats = wl_get_wireless_stats;

Lines 124-130 Link Here

(-)src/wl/sys/wl_iw.c.orig.1 (+4 lines)
124		124
125	fs = get_fs();	125	fs = get_fs();
126	set_fs(get_ds());	126	set_fs(get_ds());
		127	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
127	ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);	128	ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
		129	#else
		130	ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
		131	#endif
128	set_fs(fs);	132	set_fs(fs);
129		133
130	return ret;	134	return ret;

Return to bug 277552

Lines 222-230 Link Here

(-)src/wl/sys/wl_linux.c.orig.1 (+17 lines)
222	};	222	};
223	#endif	223	#endif
224		224
		225	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
		226	static const struct net_device_ops wl_net_device_ops =
		227	{
		228	.ndo_open = wl_open,
		229	.ndo_stop = wl_close,
		230	.ndo_start_xmit = wl_start,
		231	.ndo_get_stats = wl_get_stats,
		232	.ndo_set_mac_address = wl_set_mac_address,
		233	.ndo_set_multicast_list = wl_set_multicast_list,
		234	.ndo_do_ioctl = wl_ioctl,
		235	};
		236	#endif
		237
225	static	238	static
226	void wl_if_setup(struct net_device *dev)	239	void wl_if_setup(struct net_device *dev)
227	{	240	{
		241	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
228	dev->open = wl_open;	242	dev->open = wl_open;
229	dev->stop = wl_close;	243	dev->stop = wl_close;
230	dev->hard_start_xmit = wl_start;	244	dev->hard_start_xmit = wl_start;
Lines 232-237 Link Here
232	dev->set_mac_address = wl_set_mac_address;	246	dev->set_mac_address = wl_set_mac_address;
233	dev->set_multicast_list = wl_set_multicast_list;	247	dev->set_multicast_list = wl_set_multicast_list;
234	dev->do_ioctl = wl_ioctl;	248	dev->do_ioctl = wl_ioctl;
		249	#else
		250	dev->netdev_ops = &wl_net_device_ops;
		251	#endif
235	#ifdef CONFIG_WIRELESS_EXT	252	#ifdef CONFIG_WIRELESS_EXT
236	#if WIRELESS_EXT < 19	253	#if WIRELESS_EXT < 19
237	dev->get_wireless_stats = wl_get_wireless_stats;	254	dev->get_wireless_stats = wl_get_wireless_stats;