Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch (92cf1f23) · Commits · e / devices / android_kernel_teracube_emerald

include/linux/openvswitch.h

+1 −431

Original line number	Diff line number	Diff line
		@@ -19,436 +19,6 @@
		#ifndef _LINUX_OPENVSWITCH_H
		#define _LINUX_OPENVSWITCH_H 1

		#include <linux/types.h>

		/**
		* struct ovs_header - header for OVS Generic Netlink messages.
		* @dp_ifindex: ifindex of local port for datapath (0 to make a request not
		* specific to a datapath).
		*
		* Attributes following the header are specific to a particular OVS Generic
		* Netlink family, but all of the OVS families use this header.
		*/

		struct ovs_header {
		int dp_ifindex;
		};

		/* Datapaths. */

		#define OVS_DATAPATH_FAMILY "ovs_datapath"
		#define OVS_DATAPATH_MCGROUP "ovs_datapath"
		#define OVS_DATAPATH_VERSION 0x1

		enum ovs_datapath_cmd {
		OVS_DP_CMD_UNSPEC,
		OVS_DP_CMD_NEW,
		OVS_DP_CMD_DEL,
		OVS_DP_CMD_GET,
		OVS_DP_CMD_SET
		};

		/**
		* enum ovs_datapath_attr - attributes for %OVS_DP_* commands.
		* @OVS_DP_ATTR_NAME: Name of the network device that serves as the "local
		* port". This is the name of the network device whose dp_ifindex is given in
		* the &struct ovs_header. Always present in notifications. Required in
		* %OVS_DP_NEW requests. May be used as an alternative to specifying
		* dp_ifindex in other requests (with a dp_ifindex of 0).
		* @OVS_DP_ATTR_UPCALL_PID: The Netlink socket in userspace that is initially
		* set on the datapath port (for OVS_ACTION_ATTR_MISS). Only valid on
		* %OVS_DP_CMD_NEW requests. A value of zero indicates that upcalls should
		* not be sent.
		* @OVS_DP_ATTR_STATS: Statistics about packets that have passed through the
		* datapath. Always present in notifications.
		*
		* These attributes follow the &struct ovs_header within the Generic Netlink
		* payload for %OVS_DP_* commands.
		*/
		enum ovs_datapath_attr {
		OVS_DP_ATTR_UNSPEC,
		OVS_DP_ATTR_NAME, /* name of dp_ifindex netdev */
		OVS_DP_ATTR_UPCALL_PID, /* Netlink PID to receive upcalls */
		OVS_DP_ATTR_STATS, /* struct ovs_dp_stats */
		__OVS_DP_ATTR_MAX
		};

		#define OVS_DP_ATTR_MAX (__OVS_DP_ATTR_MAX - 1)

		struct ovs_dp_stats {
		__u64 n_hit; /* Number of flow table matches. */
		__u64 n_missed; /* Number of flow table misses. */
		__u64 n_lost; /* Number of misses not sent to userspace. */
		__u64 n_flows; /* Number of flows present */
		};

		struct ovs_vport_stats {
		__u64 rx_packets; /* total packets received */
		__u64 tx_packets; /* total packets transmitted */
		__u64 rx_bytes; /* total bytes received */
		__u64 tx_bytes; /* total bytes transmitted */
		__u64 rx_errors; /* bad packets received */
		__u64 tx_errors; /* packet transmit problems */
		__u64 rx_dropped; /* no space in linux buffers */
		__u64 tx_dropped; /* no space available in linux */
		};

		/* Fixed logical ports. */
		#define OVSP_LOCAL ((__u32)0)

		/* Packet transfer. */

		#define OVS_PACKET_FAMILY "ovs_packet"
		#define OVS_PACKET_VERSION 0x1

		enum ovs_packet_cmd {
		OVS_PACKET_CMD_UNSPEC,

		/* Kernel-to-user notifications. */
		OVS_PACKET_CMD_MISS, /* Flow table miss. */
		OVS_PACKET_CMD_ACTION, /* OVS_ACTION_ATTR_USERSPACE action. */

		/* Userspace commands. */
		OVS_PACKET_CMD_EXECUTE /* Apply actions to a packet. */
		};

		/**
		* enum ovs_packet_attr - attributes for %OVS_PACKET_* commands.
		* @OVS_PACKET_ATTR_PACKET: Present for all notifications. Contains the entire
		* packet as received, from the start of the Ethernet header onward. For
		* %OVS_PACKET_CMD_ACTION, %OVS_PACKET_ATTR_PACKET reflects changes made by
		* actions preceding %OVS_ACTION_ATTR_USERSPACE, but %OVS_PACKET_ATTR_KEY is
		* the flow key extracted from the packet as originally received.
		* @OVS_PACKET_ATTR_KEY: Present for all notifications. Contains the flow key
		* extracted from the packet as nested %OVS_KEY_ATTR_* attributes. This allows
		* userspace to adapt its flow setup strategy by comparing its notion of the
		* flow key against the kernel's.
		* @OVS_PACKET_ATTR_ACTIONS: Contains actions for the packet. Used
		* for %OVS_PACKET_CMD_EXECUTE. It has nested %OVS_ACTION_ATTR_* attributes.
		* @OVS_PACKET_ATTR_USERDATA: Present for an %OVS_PACKET_CMD_ACTION
		* notification if the %OVS_ACTION_ATTR_USERSPACE action specified an
		* %OVS_USERSPACE_ATTR_USERDATA attribute, with the same length and content
		* specified there.
		*
		* These attributes follow the &struct ovs_header within the Generic Netlink
		* payload for %OVS_PACKET_* commands.
		*/
		enum ovs_packet_attr {
		OVS_PACKET_ATTR_UNSPEC,
		OVS_PACKET_ATTR_PACKET, /* Packet data. */
		OVS_PACKET_ATTR_KEY, /* Nested OVS_KEY_ATTR_* attributes. */
		OVS_PACKET_ATTR_ACTIONS, /* Nested OVS_ACTION_ATTR_* attributes. */
		OVS_PACKET_ATTR_USERDATA, /* OVS_ACTION_ATTR_USERSPACE arg. */
		__OVS_PACKET_ATTR_MAX
		};

		#define OVS_PACKET_ATTR_MAX (__OVS_PACKET_ATTR_MAX - 1)

		/* Virtual ports. */

		#define OVS_VPORT_FAMILY "ovs_vport"
		#define OVS_VPORT_MCGROUP "ovs_vport"
		#define OVS_VPORT_VERSION 0x1

		enum ovs_vport_cmd {
		OVS_VPORT_CMD_UNSPEC,
		OVS_VPORT_CMD_NEW,
		OVS_VPORT_CMD_DEL,
		OVS_VPORT_CMD_GET,
		OVS_VPORT_CMD_SET
		};

		enum ovs_vport_type {
		OVS_VPORT_TYPE_UNSPEC,
		OVS_VPORT_TYPE_NETDEV, /* network device */
		OVS_VPORT_TYPE_INTERNAL, /* network device implemented by datapath */
		__OVS_VPORT_TYPE_MAX
		};

		#define OVS_VPORT_TYPE_MAX (__OVS_VPORT_TYPE_MAX - 1)

		/**
		* enum ovs_vport_attr - attributes for %OVS_VPORT_* commands.
		* @OVS_VPORT_ATTR_PORT_NO: 32-bit port number within datapath.
		* @OVS_VPORT_ATTR_TYPE: 32-bit %OVS_VPORT_TYPE_* constant describing the type
		* of vport.
		* @OVS_VPORT_ATTR_NAME: Name of vport. For a vport based on a network device
		* this is the name of the network device. Maximum length %IFNAMSIZ-1 bytes
		* plus a null terminator.
		* @OVS_VPORT_ATTR_OPTIONS: Vport-specific configuration information.
		* @OVS_VPORT_ATTR_UPCALL_PID: The Netlink socket in userspace that
		* OVS_PACKET_CMD_MISS upcalls will be directed to for packets received on
		* this port. A value of zero indicates that upcalls should not be sent.
		* @OVS_VPORT_ATTR_STATS: A &struct ovs_vport_stats giving statistics for
		* packets sent or received through the vport.
		*
		* These attributes follow the &struct ovs_header within the Generic Netlink
		* payload for %OVS_VPORT_* commands.
		*
		* For %OVS_VPORT_CMD_NEW requests, the %OVS_VPORT_ATTR_TYPE and
		* %OVS_VPORT_ATTR_NAME attributes are required. %OVS_VPORT_ATTR_PORT_NO is
		* optional; if not specified a free port number is automatically selected.
		* Whether %OVS_VPORT_ATTR_OPTIONS is required or optional depends on the type
		* of vport.
		* and other attributes are ignored.
		*
		* For other requests, if %OVS_VPORT_ATTR_NAME is specified then it is used to
		* look up the vport to operate on; otherwise dp_idx from the &struct
		* ovs_header plus %OVS_VPORT_ATTR_PORT_NO determine the vport.
		*/
		enum ovs_vport_attr {
		OVS_VPORT_ATTR_UNSPEC,
		OVS_VPORT_ATTR_PORT_NO, /* u32 port number within datapath */
		OVS_VPORT_ATTR_TYPE, /* u32 OVS_VPORT_TYPE_* constant. */
		OVS_VPORT_ATTR_NAME, /* string name, up to IFNAMSIZ bytes long */
		OVS_VPORT_ATTR_OPTIONS, /* nested attributes, varies by vport type */
		OVS_VPORT_ATTR_UPCALL_PID, /* u32 Netlink PID to receive upcalls */
		OVS_VPORT_ATTR_STATS, /* struct ovs_vport_stats */
		__OVS_VPORT_ATTR_MAX
		};

		#define OVS_VPORT_ATTR_MAX (__OVS_VPORT_ATTR_MAX - 1)

		/* Flows. */

		#define OVS_FLOW_FAMILY "ovs_flow"
		#define OVS_FLOW_MCGROUP "ovs_flow"
		#define OVS_FLOW_VERSION 0x1

		enum ovs_flow_cmd {
		OVS_FLOW_CMD_UNSPEC,
		OVS_FLOW_CMD_NEW,
		OVS_FLOW_CMD_DEL,
		OVS_FLOW_CMD_GET,
		OVS_FLOW_CMD_SET
		};

		struct ovs_flow_stats {
		__u64 n_packets; /* Number of matched packets. */
		__u64 n_bytes; /* Number of matched bytes. */
		};

		enum ovs_key_attr {
		OVS_KEY_ATTR_UNSPEC,
		OVS_KEY_ATTR_ENCAP, /* Nested set of encapsulated attributes. */
		OVS_KEY_ATTR_PRIORITY, /* u32 skb->priority */
		OVS_KEY_ATTR_IN_PORT, /* u32 OVS dp port number */
		OVS_KEY_ATTR_ETHERNET, /* struct ovs_key_ethernet */
		OVS_KEY_ATTR_VLAN, /* be16 VLAN TCI */
		OVS_KEY_ATTR_ETHERTYPE, /* be16 Ethernet type */
		OVS_KEY_ATTR_IPV4, /* struct ovs_key_ipv4 */
		OVS_KEY_ATTR_IPV6, /* struct ovs_key_ipv6 */
		OVS_KEY_ATTR_TCP, /* struct ovs_key_tcp */
		OVS_KEY_ATTR_UDP, /* struct ovs_key_udp */
		OVS_KEY_ATTR_ICMP, /* struct ovs_key_icmp */
		OVS_KEY_ATTR_ICMPV6, /* struct ovs_key_icmpv6 */
		OVS_KEY_ATTR_ARP, /* struct ovs_key_arp */
		OVS_KEY_ATTR_ND, /* struct ovs_key_nd */
		OVS_KEY_ATTR_SKB_MARK, /* u32 skb mark */
		__OVS_KEY_ATTR_MAX
		};

		#define OVS_KEY_ATTR_MAX (__OVS_KEY_ATTR_MAX - 1)

		/**
		* enum ovs_frag_type - IPv4 and IPv6 fragment type
		* @OVS_FRAG_TYPE_NONE: Packet is not a fragment.
		* @OVS_FRAG_TYPE_FIRST: Packet is a fragment with offset 0.
		* @OVS_FRAG_TYPE_LATER: Packet is a fragment with nonzero offset.
		*
		* Used as the @ipv4_frag in &struct ovs_key_ipv4 and as @ipv6_frag &struct
		* ovs_key_ipv6.
		*/
		enum ovs_frag_type {
		OVS_FRAG_TYPE_NONE,
		OVS_FRAG_TYPE_FIRST,
		OVS_FRAG_TYPE_LATER,
		__OVS_FRAG_TYPE_MAX
		};

		#define OVS_FRAG_TYPE_MAX (__OVS_FRAG_TYPE_MAX - 1)

		struct ovs_key_ethernet {
		__u8 eth_src[6];
		__u8 eth_dst[6];
		};

		struct ovs_key_ipv4 {
		__be32 ipv4_src;
		__be32 ipv4_dst;
		__u8 ipv4_proto;
		__u8 ipv4_tos;
		__u8 ipv4_ttl;
		__u8 ipv4_frag; /* One of OVS_FRAG_TYPE_. /
		};

		struct ovs_key_ipv6 {
		__be32 ipv6_src[4];
		__be32 ipv6_dst[4];
		__be32 ipv6_label; /* 20-bits in least-significant bits. */
		__u8 ipv6_proto;
		__u8 ipv6_tclass;
		__u8 ipv6_hlimit;
		__u8 ipv6_frag; /* One of OVS_FRAG_TYPE_. /
		};

		struct ovs_key_tcp {
		__be16 tcp_src;
		__be16 tcp_dst;
		};

		struct ovs_key_udp {
		__be16 udp_src;
		__be16 udp_dst;
		};

		struct ovs_key_icmp {
		__u8 icmp_type;
		__u8 icmp_code;
		};

		struct ovs_key_icmpv6 {
		__u8 icmpv6_type;
		__u8 icmpv6_code;
		};

		struct ovs_key_arp {
		__be32 arp_sip;
		__be32 arp_tip;
		__be16 arp_op;
		__u8 arp_sha[6];
		__u8 arp_tha[6];
		};

		struct ovs_key_nd {
		__u32 nd_target[4];
		__u8 nd_sll[6];
		__u8 nd_tll[6];
		};

		/**
		* enum ovs_flow_attr - attributes for %OVS_FLOW_* commands.
		* @OVS_FLOW_ATTR_KEY: Nested %OVS_KEY_ATTR_* attributes specifying the flow
		* key. Always present in notifications. Required for all requests (except
		* dumps).
		* @OVS_FLOW_ATTR_ACTIONS: Nested %OVS_ACTION_ATTR_* attributes specifying
		* the actions to take for packets that match the key. Always present in
		* notifications. Required for %OVS_FLOW_CMD_NEW requests, optional for
		* %OVS_FLOW_CMD_SET requests.
		* @OVS_FLOW_ATTR_STATS: &struct ovs_flow_stats giving statistics for this
		* flow. Present in notifications if the stats would be nonzero. Ignored in
		* requests.
		* @OVS_FLOW_ATTR_TCP_FLAGS: An 8-bit value giving the OR'd value of all of the
		* TCP flags seen on packets in this flow. Only present in notifications for
		* TCP flows, and only if it would be nonzero. Ignored in requests.
		* @OVS_FLOW_ATTR_USED: A 64-bit integer giving the time, in milliseconds on
		* the system monotonic clock, at which a packet was last processed for this
		* flow. Only present in notifications if a packet has been processed for this
		* flow. Ignored in requests.
		* @OVS_FLOW_ATTR_CLEAR: If present in a %OVS_FLOW_CMD_SET request, clears the
		* last-used time, accumulated TCP flags, and statistics for this flow.
		* Otherwise ignored in requests. Never present in notifications.
		*
		* These attributes follow the &struct ovs_header within the Generic Netlink
		* payload for %OVS_FLOW_* commands.
		*/
		enum ovs_flow_attr {
		OVS_FLOW_ATTR_UNSPEC,
		OVS_FLOW_ATTR_KEY, /* Sequence of OVS_KEY_ATTR_* attributes. */
		OVS_FLOW_ATTR_ACTIONS, /* Nested OVS_ACTION_ATTR_* attributes. */
		OVS_FLOW_ATTR_STATS, /* struct ovs_flow_stats. */
		OVS_FLOW_ATTR_TCP_FLAGS, /* 8-bit OR'd TCP flags. */
		OVS_FLOW_ATTR_USED, /* u64 msecs last used in monotonic time. */
		OVS_FLOW_ATTR_CLEAR, /* Flag to clear stats, tcp_flags, used. */
		__OVS_FLOW_ATTR_MAX
		};

		#define OVS_FLOW_ATTR_MAX (__OVS_FLOW_ATTR_MAX - 1)

		/**
		* enum ovs_sample_attr - Attributes for %OVS_ACTION_ATTR_SAMPLE action.
		* @OVS_SAMPLE_ATTR_PROBABILITY: 32-bit fraction of packets to sample with
		* @OVS_ACTION_ATTR_SAMPLE. A value of 0 samples no packets, a value of
		* %UINT32_MAX samples all packets and intermediate values sample intermediate
		* fractions of packets.
		* @OVS_SAMPLE_ATTR_ACTIONS: Set of actions to execute in sampling event.
		* Actions are passed as nested attributes.
		*
		* Executes the specified actions with the given probability on a per-packet
		* basis.
		*/
		enum ovs_sample_attr {
		OVS_SAMPLE_ATTR_UNSPEC,
		OVS_SAMPLE_ATTR_PROBABILITY, /* u32 number */
		OVS_SAMPLE_ATTR_ACTIONS, /* Nested OVS_ACTION_ATTR_* attributes. */
		__OVS_SAMPLE_ATTR_MAX,
		};

		#define OVS_SAMPLE_ATTR_MAX (__OVS_SAMPLE_ATTR_MAX - 1)

		/**
		* enum ovs_userspace_attr - Attributes for %OVS_ACTION_ATTR_USERSPACE action.
		* @OVS_USERSPACE_ATTR_PID: u32 Netlink PID to which the %OVS_PACKET_CMD_ACTION
		* message should be sent. Required.
		* @OVS_USERSPACE_ATTR_USERDATA: If present, its variable-length argument is
		* copied to the %OVS_PACKET_CMD_ACTION message as %OVS_PACKET_ATTR_USERDATA.
		*/
		enum ovs_userspace_attr {
		OVS_USERSPACE_ATTR_UNSPEC,
		OVS_USERSPACE_ATTR_PID, /* u32 Netlink PID to receive upcalls. */
		OVS_USERSPACE_ATTR_USERDATA, /* Optional user-specified cookie. */
		__OVS_USERSPACE_ATTR_MAX
		};

		#define OVS_USERSPACE_ATTR_MAX (__OVS_USERSPACE_ATTR_MAX - 1)

		/**
		* struct ovs_action_push_vlan - %OVS_ACTION_ATTR_PUSH_VLAN action argument.
		* @vlan_tpid: Tag protocol identifier (TPID) to push.
		* @vlan_tci: Tag control identifier (TCI) to push. The CFI bit must be set
		* (but it will not be set in the 802.1Q header that is pushed).
		*
		* The @vlan_tpid value is typically %ETH_P_8021Q. The only acceptable TPID
		* values are those that the kernel module also parses as 802.1Q headers, to
		* prevent %OVS_ACTION_ATTR_PUSH_VLAN followed by %OVS_ACTION_ATTR_POP_VLAN
		* from having surprising results.
		*/
		struct ovs_action_push_vlan {
		__be16 vlan_tpid; /* 802.1Q TPID. */
		__be16 vlan_tci; /* 802.1Q TCI (VLAN ID and priority). */
		};

		/**
		* enum ovs_action_attr - Action types.
		*
		* @OVS_ACTION_ATTR_OUTPUT: Output packet to port.
		* @OVS_ACTION_ATTR_USERSPACE: Send packet to userspace according to nested
		* %OVS_USERSPACE_ATTR_* attributes.
		* @OVS_ACTION_ATTR_SET: Replaces the contents of an existing header. The
		* single nested %OVS_KEY_ATTR_* attribute specifies a header to modify and its
		* value.
		* @OVS_ACTION_ATTR_PUSH_VLAN: Push a new outermost 802.1Q header onto the
		* packet.
		* @OVS_ACTION_ATTR_POP_VLAN: Pop the outermost 802.1Q header off the packet.
		* @OVS_ACTION_ATTR_SAMPLE: Probabilitically executes actions, as specified in
		* the nested %OVS_SAMPLE_ATTR_* attributes.
		*
		* Only a single header can be set with a single %OVS_ACTION_ATTR_SET. Not all
		* fields within a header are modifiable, e.g. the IPv4 protocol and fragment
		* type may not be changed.
		*/

		enum ovs_action_attr {
		OVS_ACTION_ATTR_UNSPEC,
		OVS_ACTION_ATTR_OUTPUT, /* u32 port number. */
		OVS_ACTION_ATTR_USERSPACE, /* Nested OVS_USERSPACE_ATTR_. /
		OVS_ACTION_ATTR_SET, /* One nested OVS_KEY_ATTR_. /
		OVS_ACTION_ATTR_PUSH_VLAN, /* struct ovs_action_push_vlan. */
		OVS_ACTION_ATTR_POP_VLAN, /* No argument. */
		OVS_ACTION_ATTR_SAMPLE, /* Nested OVS_SAMPLE_ATTR_. /
		__OVS_ACTION_ATTR_MAX
		};

		#define OVS_ACTION_ATTR_MAX (__OVS_ACTION_ATTR_MAX - 1)
		#include <uapi/linux/openvswitch.h>

		#endif /* _LINUX_OPENVSWITCH_H */

include/uapi/linux/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -285,6 +285,7 @@ header-y += nvram.h
		header-y += omap3isp.h
		header-y += omapfb.h
		header-y += oom.h
		header-y += openvswitch.h
		header-y += packet_diag.h
		header-y += param.h
		header-y += parport.h

include/uapi/linux/openvswitch.h

0 → 100644

+456 −0

File added.

Preview size limit exceeded, changes collapsed.

net/openvswitch/datapath.c

+241 −152

File changed.

Preview size limit exceeded, changes collapsed.

net/openvswitch/datapath.h

+47 −23

Original line number	Diff line number	Diff line
		@@ -57,10 +57,9 @@ struct dp_stats_percpu {
		* struct datapath - datapath for flow-based packet switching
		* @rcu: RCU callback head for deferred destruction.
		* @list_node: Element in global 'dps' list.
		* @n_flows: Number of flows currently in flow table.
		* @table: Current flow table. Protected by genl_lock and RCU.
		* @table: Current flow table. Protected by ovs_mutex and RCU.
		* @ports: Hash table for ports. %OVSP_LOCAL port always exists. Protected by
		* RTNL and RCU.
		* ovs_mutex and RCU.
		* @stats_percpu: Per-CPU datapath statistics.
		* @net: Reference to net namespace.
		*
		@@ -86,26 +85,6 @@ struct datapath {
		#endif
		};

		struct vport ovs_lookup_vport(const struct datapath dp, u16 port_no);

		static inline struct vport ovs_vport_rcu(const struct datapath dp, int port_no)
		{
		WARN_ON_ONCE(!rcu_read_lock_held());
		return ovs_lookup_vport(dp, port_no);
		}

		static inline struct vport ovs_vport_rtnl_rcu(const struct datapath dp, int port_no)
		{
		WARN_ON_ONCE(!rcu_read_lock_held() && !rtnl_is_locked());
		return ovs_lookup_vport(dp, port_no);
		}

		static inline struct vport ovs_vport_rtnl(const struct datapath dp, int port_no)
		{
		ASSERT_RTNL();
		return ovs_lookup_vport(dp, port_no);
		}

		/**
		* struct ovs_skb_cb - OVS data in skb CB
		* @flow: The flow associated with this packet. May be %NULL if no flow.
		@@ -132,6 +111,30 @@ struct dp_upcall_info {
		u32 portid;
		};

		/**
		* struct ovs_net - Per net-namespace data for ovs.
		* @dps: List of datapaths to enable dumping them all out.
		* Protected by genl_mutex.
		*/
		struct ovs_net {
		struct list_head dps;
		struct work_struct dp_notify_work;
		};

		extern int ovs_net_id;
		void ovs_lock(void);
		void ovs_unlock(void);

		#ifdef CONFIG_LOCKDEP
		int lockdep_ovsl_is_held(void);
		#else
		#define lockdep_ovsl_is_held() 1
		#endif

		#define ASSERT_OVSL() WARN_ON(unlikely(!lockdep_ovsl_is_held()))
		#define ovsl_dereference(p) \
		rcu_dereference_protected(p, lockdep_ovsl_is_held())

		static inline struct net ovs_dp_get_net(struct datapath dp)
		{
		return read_pnet(&dp->net);
		@@ -142,6 +145,26 @@ static inline void ovs_dp_set_net(struct datapath dp, struct net net)
		write_pnet(&dp->net, net);
		}

		struct vport ovs_lookup_vport(const struct datapath dp, u16 port_no);

		static inline struct vport ovs_vport_rcu(const struct datapath dp, int port_no)
		{
		WARN_ON_ONCE(!rcu_read_lock_held());
		return ovs_lookup_vport(dp, port_no);
		}

		static inline struct vport ovs_vport_ovsl_rcu(const struct datapath dp, int port_no)
		{
		WARN_ON_ONCE(!rcu_read_lock_held() && !lockdep_ovsl_is_held());
		return ovs_lookup_vport(dp, port_no);
		}

		static inline struct vport ovs_vport_ovsl(const struct datapath dp, int port_no)
		{
		ASSERT_OVSL();
		return ovs_lookup_vport(dp, port_no);
		}

		extern struct notifier_block ovs_dp_device_notifier;
		extern struct genl_multicast_group ovs_dp_vport_multicast_group;

		@@ -155,4 +178,5 @@ struct sk_buff ovs_vport_cmd_build_info(struct vport , u32 pid, u32 seq,
		u8 cmd);

		int ovs_execute_actions(struct datapath dp, struct sk_buff skb);
		void ovs_dp_notify_wq(struct work_struct *work);
		#endif /* datapath.h */