Merge branch 'mainstream'

[sliver-openvswitch.git] / datapath / vport.c

diff --git a/datapath/vport.c b/datapath/vport.c
index f26beaf..7f12acc 100644 (file)
--- a/datapath/vport.c
+++ b/datapath/vport.c
@@ -35,6 +35,9 @@
 #include "vport.h"
 #include "vport-internal_dev.h"
 
+static void ovs_vport_record_error(struct vport *,
+                                  enum vport_err_type err_type);
+
 /* List of statically compiled vport implementations.  Don't forget to also
  * add yours to the list at the bottom of vport.h. */
 static const struct vport_ops *vport_ops_list[] = {
@@ -44,10 +47,8 @@ static const struct vport_ops *vport_ops_list[] = {
        &ovs_gre_vport_ops,
        &ovs_gre64_vport_ops,
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
        &ovs_vxlan_vport_ops,
        &ovs_lisp_vport_ops,
-#endif
 };
 
 /* Protected by RCU read lock for reading, ovs_mutex for writing. */
@@ -241,7 +242,7 @@ void ovs_vport_del(struct vport *vport)
  * @stats: stats to set
  *
  * Provides a set of transmit, receive, and error stats to be added as an
- * offset to the collect data when stats are retreived.  Some devices may not
+ * offset to the collected data when stats are retrieved.  Some devices may not
  * support setting the stats, in which case the result will always be
  * -EOPNOTSUPP.
  *
@@ -413,7 +414,8 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb)
  * If using the vport generic stats layer indicate that an error of the given
  * type has occurred.
  */
-void ovs_vport_record_error(struct vport *vport, enum vport_err_type err_type)
+static void ovs_vport_record_error(struct vport *vport,
+                                  enum vport_err_type err_type)
 {
        spin_lock(&vport->stats_lock);