X-Git-Url: http://bbs.cooldavid.org/git/?p=jme.git;a=blobdiff_plain;f=jme.h;fp=jme.h;h=a2402407e783ff3b6f0213454def1f74d4867dec;hp=c010390e1e3675314bb39dd8358275a908e79776;hb=5141719b9c30681a881413c07bf9d7b7dd76f238;hpb=767e5b98bfac71b25859fcc8ad5ddefa11a7e9ec

diff --git a/jme.h b/jme.h
index c010390..a240240 100644
--- a/jme.h
+++ b/jme.h
@@ -116,6 +116,10 @@ do {									\
 #define __USE_NDO_FIX_FEATURES__
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
+#define __UNIFY_VLAN_RX_PATH__
+#endif
+
 /*
  * Extra PCI Configuration space interface
  */
@@ -591,7 +595,9 @@ struct jme_adapter {
 	u32			msg_enable;
 	struct ethtool_cmd	old_ecmd;
 	unsigned int		old_mtu;
+#ifndef __UNIFY_VLAN_RX_PATH__
 	struct vlan_group	*vlgrp;
+#endif
 	struct dynpcc_info	dpi;
 	atomic_t		intr_sem;
 	atomic_t		link_changing;
@@ -599,9 +605,11 @@ struct jme_adapter {
 	atomic_t		rx_cleaning;
 	atomic_t		rx_empty;
 	int			(*jme_rx)(struct sk_buff *skb);
+#ifndef __UNIFY_VLAN_RX_PATH__
 	int			(*jme_vlan_rx)(struct sk_buff *skb,
 					  struct vlan_group *grp,
 					  unsigned short vlan_tag);
+#endif
 	DECLARE_NAPI_STRUCT
 	DECLARE_NET_DEVICE_STATS
 };