Attachment #301473 for bug #384739

Lines 40-45 Link Here

(-)source802//vmnet-only/filter.c (+4 lines)
40	#include "vnetInt.h"	40	#include "vnetInt.h"
41	#include "vmnetInt.h"	41	#include "vmnetInt.h"
42		42
		43	#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
		44	#include <linux/export.h>
		45	#endif
		46
43	// VNet_FilterLogPacket.action for dropped packets	47	// VNet_FilterLogPacket.action for dropped packets
44	#define VNET_FILTER_ACTION_DRP (1)	48	#define VNET_FILTER_ACTION_DRP (1)
45	#define VNET_FILTER_ACTION_DRP_SHORT (2)	49	#define VNET_FILTER_ACTION_DRP_SHORT (2)




static int  VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev);
static struct net_device_stats *VNetNetifGetStats(struct net_device *dev);
static int  VNetNetifSetMAC(struct net_device *dev, void *addr);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 42, 0) || (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0))
static void VNetNetifSetMulticast(struct net_device *dev);
#endif
#if 0
static void VNetNetifTxTimeout(struct net_device *dev);
#endif

      .ndo_stop = VNetNetifClose,
      .ndo_get_stats = VNetNetifGetStats,
      .ndo_set_mac_address = VNetNetifSetMAC,
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 42, 0) || (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0))
      .ndo_set_multicast_list = VNetNetifSetMulticast,
#endif
      /*
       * We cannot stuck... If someone will report problems under
       * low memory conditions or some such, we should enable it.

 *
 *----------------------------------------------------------------------
 */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 42, 0) || (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0))
void
VNetNetifSetMulticast(struct net_device *dev) // IN: unused
{
}
#endif

/*
 *----------------------------------------------------------------------

Lines 517-526 Link Here

(-)source802//vmnet-only/userif.c (+8 lines)
517	unsigned int tmpCsum;	517	unsigned int tmpCsum;
518	const void *vaddr;	518	const void *vaddr;
519		519
		520	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 42, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)) \|\| LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
		521	vaddr = kmap(skb_frag_page(frag));
		522	#else
520	vaddr = kmap(frag->page);	523	vaddr = kmap(frag->page);
		524	#endif
521	tmpCsum = csum_and_copy_to_user(vaddr + frag->page_offset,	525	tmpCsum = csum_and_copy_to_user(vaddr + frag->page_offset,
522	curr, frag->size, 0, &err);	526	curr, frag->size, 0, &err);
		527	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 42, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)) \|\| LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
		528	kunmap(skb_frag_page(frag));
		529	#else
523	kunmap(frag->page);	530	kunmap(frag->page);
		531	#endif
524	if (err) {	532	if (err) {
525	return err;	533	return err;
526	}	534	}

Return to bug 384739

Lines 62-68 Link Here

(-)source802//vmnet-only/netif.c (-2 / +6 lines)
62	static int VNetNetifStartXmit(struct sk_buff skb, struct net_device dev);	62	static int VNetNetifStartXmit(struct sk_buff skb, struct net_device dev);
63	static struct net_device_stats VNetNetifGetStats(struct net_device dev);	63	static struct net_device_stats VNetNetifGetStats(struct net_device dev);
64	static int VNetNetifSetMAC(struct net_device dev, void addr);	64	static int VNetNetifSetMAC(struct net_device dev, void addr);
		65	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 42, 0) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0))
65	static void VNetNetifSetMulticast(struct net_device *dev);	66	static void VNetNetifSetMulticast(struct net_device *dev);
		67	#endif
66	#if 0	68	#if 0
67	static void VNetNetifTxTimeout(struct net_device *dev);	69	static void VNetNetifTxTimeout(struct net_device *dev);
68	#endif	70	#endif
Lines 131-137 Link Here
131	.ndo_stop = VNetNetifClose,	133	.ndo_stop = VNetNetifClose,
132	.ndo_get_stats = VNetNetifGetStats,	134	.ndo_get_stats = VNetNetifGetStats,
133	.ndo_set_mac_address = VNetNetifSetMAC,	135	.ndo_set_mac_address = VNetNetifSetMAC,
		136	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 42, 0) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0))
134	.ndo_set_multicast_list = VNetNetifSetMulticast,	137	.ndo_set_multicast_list = VNetNetifSetMulticast,
		138	#endif
135	/*	139	/*
136	* We cannot stuck... If someone will report problems under	140	* We cannot stuck... If someone will report problems under
137	* low memory conditions or some such, we should enable it.	141	* low memory conditions or some such, we should enable it.
Lines 611-622 Link Here
611	*	615	*
612	*----------------------------------------------------------------------	616	*----------------------------------------------------------------------
613	*/	617	*/
614		618	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 42, 0) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0))
615	void	619	void
616	VNetNetifSetMulticast(struct net_device *dev) // IN: unused	620	VNetNetifSetMulticast(struct net_device *dev) // IN: unused
617	{	621	{
618	}	622	}
619		623	#endif
620		624
621	/*	625	/*
622	*----------------------------------------------------------------------	626	*----------------------------------------------------------------------