Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

[firefly-linux-kernel-4.4.55.git] / net / openvswitch / vport.h

diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
index 7282b8436ba757556c0e1451f8b8aaef3146d2cb..68a377bc0841e7bfd0a5b1200a4a3b938adc9251 100644 (file)
--- a/net/openvswitch/vport.h
+++ b/net/openvswitch/vport.h
@@ -19,6 +19,7 @@
 #ifndef VPORT_H
 #define VPORT_H 1
 
+#include <linux/if_tunnel.h>
 #include <linux/list.h>
 #include <linux/netlink.h>
 #include <linux/openvswitch.h>
@@ -50,14 +51,6 @@ int ovs_vport_send(struct vport *, struct sk_buff *);
 
 /* The following definitions are for implementers of vport devices: */
 
-struct vport_percpu_stats {
-       u64 rx_bytes;
-       u64 rx_packets;
-       u64 tx_bytes;
-       u64 tx_packets;
-       struct u64_stats_sync sync;
-};
-
 struct vport_err_stats {
        u64 rx_dropped;
        u64 rx_errors;
@@ -89,7 +82,7 @@ struct vport {
        struct hlist_node dp_hash_node;
        const struct vport_ops *ops;
 
-       struct vport_percpu_stats __percpu *percpu_stats;
+       struct pcpu_tstats __percpu *percpu_stats;
 
        spinlock_t stats_lock;
        struct vport_err_stats err_stats;
@@ -131,7 +124,6 @@ struct vport_parms {
  * have any configuration.
  * @get_name: Get the device's name.
  * @get_config: Get the device's configuration.
- * @get_ifindex: Get the system interface index associated with the device.
  * May be null if the device does not have an ifindex.
  * @send: Send a packet on the device.  Returns the length of the packet sent.
  */
@@ -148,7 +140,6 @@ struct vport_ops {
        /* Called with rcu_read_lock or ovs_mutex. */
        const char *(*get_name)(const struct vport *);
        void (*get_config)(const struct vport *, void *);
-       int (*get_ifindex)(const struct vport *);
 
        int (*send)(struct vport *, struct sk_buff *);
 };