Attachment #242185 for bug #331961

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




		packet_filter |= NDIS_PACKET_TYPE_PROMISCUOUS |
			NDIS_PACKET_TYPE_ALL_LOCAL;
	} else if (net_dev->flags & IFF_ALLMULTI ||
		   netdev_mc_count(net_dev) > wnd->multicast_size) {
		packet_filter |= NDIS_PACKET_TYPE_ALL_MULTICAST;
		TRACE2("0x%08x", packet_filter);
	} else if (netdev_mc_count(net_dev) > 0) {
		int i, size;
		char *buf;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
		struct netdev_hw_addr *ha;
#else
		struct dev_mc_list *mclist;
#endif
		size = min(wnd->multicast_size, netdev_mc_count(net_dev));
		TRACE2("%d, %d", wnd->multicast_size, netdev_mc_count(net_dev));
		buf = kmalloc(size * ETH_ALEN, GFP_KERNEL);
		if (!buf) {
			WARNING("couldn't allocate memory");
			EXIT2(return);
		}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
		i = 0;
		netdev_for_each_mc_addr(ha, net_dev) {
			if (i >= size)
				break;
			memcpy(buf + i * ETH_ALEN, ha->addr, ETH_ALEN);
			TRACE2(MACSTRSEP, MAC2STR(ha->addr));
 			i++;
 		}
#else
		mclist = net_dev->mc_list;
		for (i = 0; i < size && mclist; mclist = mclist->next) {
			if (mclist->dmi_addrlen != ETH_ALEN)

			TRACE2(MACSTRSEP, MAC2STR(mclist->dmi_addr));
			i++;
		}
#endif
		res = mp_set(wnd, OID_802_3_MULTICAST_LIST, buf, i * ETH_ALEN);
		if (res == NDIS_STATUS_SUCCESS && i > 0)
			packet_filter |= NDIS_PACKET_TYPE_MULTICAST;

Lines 191-197 static void wrap_free_urb(struct urb *ur Link Here

(-)driver/usb.c (-2 / +2 lines)
191	if (wrap_urb->flags & WRAP_URB_COPY_BUFFER) {	191	if (wrap_urb->flags & WRAP_URB_COPY_BUFFER) {
192	USBTRACE("freeing DMA buffer for URB: %p %p",	192	USBTRACE("freeing DMA buffer for URB: %p %p",
193	urb, urb->transfer_buffer);	193	urb, urb->transfer_buffer);
194	usb_buffer_free(IRP_WRAP_DEVICE(irp)->usb.udev,	194	usb_free_coherent(IRP_WRAP_DEVICE(irp)->usb.udev,
195	urb->transfer_buffer_length,	195	urb->transfer_buffer_length,
196	urb->transfer_buffer, urb->transfer_dma);	196	urb->transfer_buffer, urb->transfer_dma);
197	}	197	}
Lines 304-310 static struct urb *wrap_alloc_urb(struct Link Here
304	#endif	304	#endif
305	)) {	305	)) {
306	urb->transfer_buffer =	306	urb->transfer_buffer =
307	usb_buffer_alloc(wd->usb.udev, buf_len, alloc_flags,	307	usb_alloc_coherent(wd->usb.udev, buf_len, alloc_flags,
308	&urb->transfer_dma);	308	&urb->transfer_dma);
309	if (!urb->transfer_buffer) {	309	if (!urb->transfer_buffer) {
310	WARNING("couldn't allocate dma buf");	310	WARNING("couldn't allocate dma buf");

Lines 324-329 typedef u32 pm_message_t; Link Here

(-)driver/ntoskernel.h (+6 lines)
324	kmem_cache_create(name, size, align, flags, NULL)	324	kmem_cache_create(name, size, align, flags, NULL)
325	#endif	325	#endif
326		326
		327	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)
		328	#define netdev_mc_count(dev) ((dev)->mc_count)
		329	#define usb_alloc_coherent(dev, size, mem_flags, dma) (usb_buffer_alloc((dev), (size), (mem_flags), (dma)))
		330	#define usb_free_coherent(dev, size, addr, dma) (usb_buffer_free((dev), (size), (addr), (dma)))
		331	#endif
		332
327	#include "winnt_types.h"	333	#include "winnt_types.h"
328	#include "ndiswrapper.h"	334	#include "ndiswrapper.h"
329	#include "pe_linker.h"	335	#include "pe_linker.h"

Return to bug 331961

Lines 950-969 static void set_multicast_list(struct nd Link Here

(-)driver/wrapndis.c (-4 / +19 lines)
950	packet_filter \|= NDIS_PACKET_TYPE_PROMISCUOUS \|	950	packet_filter \|= NDIS_PACKET_TYPE_PROMISCUOUS \|
951	NDIS_PACKET_TYPE_ALL_LOCAL;	951	NDIS_PACKET_TYPE_ALL_LOCAL;
952	} else if (net_dev->flags & IFF_ALLMULTI \|\|	952	} else if (net_dev->flags & IFF_ALLMULTI \|\|
953	net_dev->mc_count > wnd->multicast_size) {	953	netdev_mc_count(net_dev) > wnd->multicast_size) {
954	packet_filter \|= NDIS_PACKET_TYPE_ALL_MULTICAST;	954	packet_filter \|= NDIS_PACKET_TYPE_ALL_MULTICAST;
955	TRACE2("0x%08x", packet_filter);	955	TRACE2("0x%08x", packet_filter);
956	} else if (net_dev->mc_count > 0) {	956	} else if (netdev_mc_count(net_dev) > 0) {
957	int i, size;	957	int i, size;
958	char *buf;	958	char *buf;
		959	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
		960	struct netdev_hw_addr *ha;
		961	#else
959	struct dev_mc_list *mclist;	962	struct dev_mc_list *mclist;
960	size = min(wnd->multicast_size, net_dev->mc_count);	963	#endif
961	TRACE2("%d, %d", wnd->multicast_size, net_dev->mc_count);	964	size = min(wnd->multicast_size, netdev_mc_count(net_dev));
		965	TRACE2("%d, %d", wnd->multicast_size, netdev_mc_count(net_dev));
962	buf = kmalloc(size * ETH_ALEN, GFP_KERNEL);	966	buf = kmalloc(size * ETH_ALEN, GFP_KERNEL);
963	if (!buf) {	967	if (!buf) {
964	WARNING("couldn't allocate memory");	968	WARNING("couldn't allocate memory");
965	EXIT2(return);	969	EXIT2(return);
966	}	970	}
		971	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
		972	i = 0;
		973	netdev_for_each_mc_addr(ha, net_dev) {
		974	if (i >= size)
		975	break;
		976	memcpy(buf + i * ETH_ALEN, ha->addr, ETH_ALEN);
		977	TRACE2(MACSTRSEP, MAC2STR(ha->addr));
		978	i++;
		979	}
		980	#else
967	mclist = net_dev->mc_list;	981	mclist = net_dev->mc_list;
968	for (i = 0; i < size && mclist; mclist = mclist->next) {	982	for (i = 0; i < size && mclist; mclist = mclist->next) {
969	if (mclist->dmi_addrlen != ETH_ALEN)	983	if (mclist->dmi_addrlen != ETH_ALEN)
Lines 972-977 static void set_multicast_list(struct nd Link Here
972	TRACE2(MACSTRSEP, MAC2STR(mclist->dmi_addr));	986	TRACE2(MACSTRSEP, MAC2STR(mclist->dmi_addr));
973	i++;	987	i++;
974	}	988	}
		989	#endif
975	res = mp_set(wnd, OID_802_3_MULTICAST_LIST, buf, i * ETH_ALEN);	990	res = mp_set(wnd, OID_802_3_MULTICAST_LIST, buf, i * ETH_ALEN);
976	if (res == NDIS_STATUS_SUCCESS && i > 0)	991	if (res == NDIS_STATUS_SUCCESS && i > 0)
977	packet_filter \|= NDIS_PACKET_TYPE_MULTICAST;	992	packet_filter \|= NDIS_PACKET_TYPE_MULTICAST;