Merge "citrix" into "master".

[sliver-openvswitch.git] / datapath / datapath.h

diff --git a/datapath/datapath.h b/datapath/datapath.h
index 122706a..9b4c438 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -14,7 +14,6 @@
 #include <asm/page.h>
 #include <linux/kernel.h>
 #include <linux/mutex.h>
-#include <linux/netlink.h>
 #include <linux/netdevice.h>
 #include <linux/workqueue.h>
 #include <linux/skbuff.h>
@@ -25,8 +24,9 @@
 /* Mask for the priority bits in a vlan header.  If we ever merge upstream
  * then this should go into include/linux/if_vlan.h. */
 #define VLAN_PCP_MASK 0xe000
+#define VLAN_PCP_SHIFT 13
 
-#define DP_MAX_PORTS 256
+#define DP_MAX_PORTS 1024
 #define DP_MAX_GROUPS 16
 
 #define DP_L2_BITS (PAGE_SHIFT - ilog2(sizeof(struct dp_bucket*)))