ofproto: Mark 'ofproto' arg in is_mirror_output_bundle() as const.

[openvswitch] / datapath / datapath.h

diff --git a/datapath/datapath.h b/datapath/datapath.h
index 8a71391346100ab4e31a99600707024c325bf466..4964a51c6cade04e708ee3ef51e3908aa879cbf5 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -33,7 +33,6 @@ struct vport;
 /**
  * struct dp_stats_percpu - per-cpu packet processing statistics for a given
  * datapath.
- * @n_frags: Number of IP fragments processed by datapath.
  * @n_hit: Number of received packets for which a matching flow was found in
  * the flow table.
  * @n_miss: Number of received packets that had no matching flow in the flow
@@ -44,7 +43,6 @@ struct vport;
  * one of the datapath's queues).
  */
 struct dp_stats_percpu {
-       u64 n_frags;
        u64 n_hit;
        u64 n_missed;
        u64 n_lost;
@@ -56,7 +54,6 @@ struct dp_stats_percpu {
  * @rcu: RCU callback head for deferred destruction.
  * @list_node: Element in global 'dps' list.
  * @ifobj: Represents /sys/class/net/<devname>/brif.  Protected by RTNL.
- * @drop_frags: Drop all IP fragments if nonzero.
  * @n_flows: Number of flows currently in flow table.
  * @table: Current flow table.  Protected by genl_lock and RCU.
  * @ports: Map from port number to &struct vport.  %OVSP_LOCAL port
@@ -73,8 +70,6 @@ struct datapath {
        struct list_head list_node;
        struct kobject ifobj;
 
-       int drop_frags;
-
        /* Flow table. */
        struct flow_table __rcu *table;
 
@@ -117,13 +112,17 @@ struct ovs_skb_cb {
  * struct dp_upcall - metadata to include with a packet to send to userspace
  * @cmd: One of %OVS_PACKET_CMD_*.
  * @key: Becomes %OVS_PACKET_ATTR_KEY.  Must be nonnull.
- * @userdata: Is passed to user-space as %OVS_PACKET_ATTR_USERDATA if @cmd is
- * %OVS_PACKET_CMD_ACTION.
+ * @userdata: If nonnull, its u64 value is extracted and passed to userspace as
+ * %OVS_PACKET_ATTR_USERDATA.
+ * @pid: Netlink PID to which packet should be sent.  If @pid is 0 then no
+ * packet is sent and the packet is accounted in the datapath's @n_lost
+ * counter.
  */
 struct dp_upcall_info {
        u8 cmd;
        const struct sw_flow_key *key;
-       u64 userdata;
+       const struct nlattr *userdata;
+       u32 pid;
 };
 
 extern struct notifier_block dp_device_notifier;