gre: Net namespace identifiers are read_mostly.

[openvswitch] / datapath / datapath.h

diff --git a/datapath/datapath.h b/datapath/datapath.h
index 122706a8b02a101e559e666cd4363a88bf50182a..d6883db28f3d23c1519b42e262ff3a20132dae98 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*)))
@@ -151,6 +151,7 @@ void dp_process_received_packet(struct sk_buff *, struct net_bridge_port *);
 int dp_del_port(struct net_bridge_port *);
 int dp_output_control(struct datapath *, struct sk_buff *, int, u32 arg);
 int dp_min_mtu(const struct datapath *dp);
+void set_dp_devs_mtu(const struct datapath *dp, struct net_device *dev);
 
 struct datapath *get_dp(int dp_idx);
 
@@ -169,5 +170,6 @@ static inline int skb_checksum_setup(struct sk_buff *skb)
 #endif
 
 int vswitch_skb_checksum_setup(struct sk_buff *skb);
+void forward_ip_summed(struct sk_buff *skb);
 
 #endif /* datapath.h */