vswitchd: Delete DP_MAX_PORTS.

[openvswitch] / datapath / datapath.h

diff --git a/datapath/datapath.h b/datapath/datapath.h
index e1bdb7b4ce17f621d0fbc67d6608b774244c2185..e4c6534f7632eed589c3105d28cdf2c30d956a1a 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -66,7 +66,7 @@ struct dp_stats_percpu {
  * @queues: %DP_N_QUEUES sets of queued packets for userspace to handle.
  * @waitqueue: Waitqueue, for waiting for new packets in @queues.
  * @n_flows: Number of flows currently in flow table.
- * @table: Current flow table (RCU protected).
+ * @table: Current flow table.
  * @n_ports: Number of ports currently in @ports.
  * @ports: Map from port number to &struct vport.  %ODPP_LOCAL port
  * always exists, other ports may be %NULL.
@@ -88,15 +88,15 @@ struct datapath {
        wait_queue_head_t waitqueue;
 
        /* Flow table. */
-       struct tbl *table;
+       struct tbl __rcu *table;
 
        /* Switch ports. */
        unsigned int n_ports;
-       struct vport *ports[DP_MAX_PORTS];
+       struct vport __rcu *ports[DP_MAX_PORTS];
        struct list_head port_list;
 
        /* Stats. */
-       struct dp_stats_percpu *stats_percpu;
+       struct dp_stats_percpu __percpu *stats_percpu;
 
        /* sFlow Sampling */
        unsigned int sflow_probability;
@@ -108,8 +108,8 @@ struct datapath {
  * @flow: The flow associated with this packet.  May be %NULL if no flow.
  * @ip_summed: Consistently stores L4 checksumming status across different
  * kernel versions.
- * @tun_id: ID (in network byte order) of the tunnel that encapsulated this
- * packet. It is 0 if the packet was not received on a tunnel.
+ * @tun_id: ID of the tunnel that encapsulated this packet.  It is 0 if the
+ * packet was not received on a tunnel.
  */
 struct ovs_skb_cb {
        struct vport            *vport;
@@ -117,7 +117,7 @@ struct ovs_skb_cb {
 #ifdef NEED_CSUM_NORMALIZE
        enum csum_type          ip_summed;
 #endif
-       __be32                  tun_id;
+       __be64                  tun_id;
 };
 #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb)
 
@@ -126,7 +126,7 @@ extern int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd);
 
 void dp_process_received_packet(struct vport *, struct sk_buff *);
 int dp_detach_port(struct vport *);
-int dp_output_control(struct datapath *, struct sk_buff *, int, u32 arg);
+int dp_output_control(struct datapath *, struct sk_buff *, int, u64 arg);
 int dp_min_mtu(const struct datapath *dp);
 void set_internal_devs_mtu(const struct datapath *dp);