datapath: Remove dead code.

Several blocks of code were either no longer being called or had
been "#if 0"'d out for a long time.  This removes them.

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 50c7f6ec2064dc956c8c84ffa82054b73399a751..73f734801760d3fc491c9f9160371322d26c1d8a 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -69,9 +69,6 @@ EXPORT_SYMBOL(dp_ioctl_hook);
 static struct datapath *dps[ODP_MAX];
 static DEFINE_MUTEX(dp_mutex);
 
-/* Number of milliseconds between runs of the maintenance thread. */
-#define MAINT_SLEEP_MSECS 1000
-
 static int new_dp_port(struct datapath *, struct odp_port *, int port_no);
 
 /* Must be called with rcu_read_lock or dp_mutex. */

diff --git a/datapath/dp_sysfs_dp.c b/datapath/dp_sysfs_dp.c
index 91dd56f8fa972e0d17a403cc5193e64e57f0d2aa..8214c604e39d5956d7f7002e60dba6e73010f1dd 100644 (file)
--- a/datapath/dp_sysfs_dp.c
+++ b/datapath/dp_sysfs_dp.c
@@ -20,8 +20,6 @@
 #include <linux/netdevice.h>
 #include <linux/if_bridge.h>
 #include <linux/rtnetlink.h>
-#include <linux/spinlock.h>
-#include <linux/times.h>
 #include <linux/version.h>
 
 #include "dp_sysfs.h"
@@ -29,7 +27,6 @@
 #include "vport-internal_dev.h"
 
 #ifdef CONFIG_SYSFS
-#define to_dev(obj)    container_of(obj, struct device, kobj)
 
 /* Hack to attempt to build on more platforms. */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)
@@ -67,11 +64,6 @@ static ssize_t store_bridge_parm(DEVICE_PARAMS,
        if (endp == buf)
                return -EINVAL;
 
-#if 0
-       spin_lock_bh(&br->lock);
-       (*set)(br, val);
-       spin_unlock_bh(&br->lock);
-#else
        /* xxx We use a default value of 0 for all fields.  If the caller is
         * xxx attempting to set the value to our default, just silently
         * xxx ignore the request. 
@@ -80,31 +72,19 @@ static ssize_t store_bridge_parm(DEVICE_PARAMS,
                printk("%s: xxx writing dp parms not supported yet!\n", 
                       dp_name(dp));
        }
-#endif
+
        return len;
 }
 
 
 static ssize_t show_forward_delay(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       struct datapath *dp = sysfs_get_dp(to_net_dev(d));
-       return sprintf(buf, "%lu\n", jiffies_to_clock_t(br->forward_delay));
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 
 static void set_forward_delay(struct datapath *dp, unsigned long val)
 {
-#if 0
-       unsigned long delay = clock_t_to_jiffies(val);
-       br->forward_delay = delay;
-       if (br_is_root_bridge(br))
-               br->bridge_forward_delay = delay;
-#else
        printk("%s: xxx attempt to set_forward_delay()\n", dp_name(dp));
-#endif
 }
 
 static ssize_t store_forward_delay(DEVICE_PARAMS,
@@ -117,24 +97,12 @@ static INTERNAL_DEVICE_ATTR(forward_delay, S_IRUGO | S_IWUSR,
 
 static ssize_t show_hello_time(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       return sprintf(buf, "%lu\n",
-                      jiffies_to_clock_t(to_bridge(d)->hello_time));
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 
 static void set_hello_time(struct datapath *dp, unsigned long val)
 {
-#if 0
-       unsigned long t = clock_t_to_jiffies(val);
-       br->hello_time = t;
-       if (br_is_root_bridge(br))
-               br->bridge_hello_time = t;
-#else
        printk("%s: xxx attempt to set_hello_time()\n", dp_name(dp));
-#endif
 }
 
 static ssize_t store_hello_time(DEVICE_PARAMS,
@@ -148,24 +116,12 @@ static INTERNAL_DEVICE_ATTR(hello_time, S_IRUGO | S_IWUSR, show_hello_time,
 
 static ssize_t show_max_age(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       return sprintf(buf, "%lu\n",
-                      jiffies_to_clock_t(to_bridge(d)->max_age));
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 
 static void set_max_age(struct datapath *dp, unsigned long val)
 {
-#if 0
-       unsigned long t = clock_t_to_jiffies(val);
-       br->max_age = t;
-       if (br_is_root_bridge(br))
-               br->bridge_max_age = t;
-#else
        printk("%s: xxx attempt to set_max_age()\n", dp_name(dp));
-#endif
 }
 
 static ssize_t store_max_age(DEVICE_PARAMS,
@@ -177,21 +133,12 @@ static INTERNAL_DEVICE_ATTR(max_age, S_IRUGO | S_IWUSR, show_max_age, store_max_
 
 static ssize_t show_ageing_time(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       struct datapath *dp = sysfs_get_dp(to_net_dev(d));
-       return sprintf(buf, "%lu\n", jiffies_to_clock_t(br->ageing_time));
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 
 static void set_ageing_time(struct datapath *dp, unsigned long val)
 {
-#if 0
-       br->ageing_time = clock_t_to_jiffies(val);
-#else
        printk("%s: xxx attempt to set_ageing_time()\n", dp_name(dp));
-#endif
 }
 
 static ssize_t store_ageing_time(DEVICE_PARAMS,
@@ -204,12 +151,7 @@ static INTERNAL_DEVICE_ATTR(ageing_time, S_IRUGO | S_IWUSR, show_ageing_time,
 
 static ssize_t show_stp_state(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       struct datapath *dp = sysfs_get_dp(to_net_dev(d));
-       return sprintf(buf, "%d\n", br->stp_enabled);
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 
 
@@ -218,23 +160,8 @@ static ssize_t store_stp_state(DEVICE_PARAMS,
                               size_t len)
 {
        struct datapath *dp = sysfs_get_dp(to_net_dev(d));
-#if 0
-       char *endp;
-       unsigned long val;
 
-       if (!capable(CAP_NET_ADMIN))
-               return -EPERM;
-
-       val = simple_strtoul(buf, &endp, 0);
-       if (endp == buf)
-               return -EINVAL;
-
-       rtnl_lock();
-       br_stp_set_enabled(br, val);
-       rtnl_unlock();
-#else
        printk("%s: xxx attempt to set_stp_state()\n", dp_name(dp));
-#endif
 
        return len;
 }
@@ -243,22 +170,12 @@ static INTERNAL_DEVICE_ATTR(stp_state, S_IRUGO | S_IWUSR, show_stp_state,
 
 static ssize_t show_priority(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       struct datapath *dp = sysfs_get_dp(to_net_dev(d));
-       return sprintf(buf, "%d\n",
-                      (br->bridge_id.prio[0] << 8) | br->bridge_id.prio[1]);
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 
 static void set_priority(struct datapath *dp, unsigned long val)
 {
-#if 0
-       br_stp_set_bridge_priority(br, (u16) val);
-#else
        printk("%s: xxx attempt to set_priority()\n", dp_name(dp));
-#endif
 }
 
 static ssize_t store_priority(DEVICE_PARAMS,
@@ -270,11 +187,7 @@ static INTERNAL_DEVICE_ATTR(priority, S_IRUGO | S_IWUSR, show_priority, store_pr
 
 static ssize_t show_root_id(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       return br_show_bridge_id(buf, &to_bridge(d)->designated_root);
-#else
        return sprintf(buf, "0000.010203040506\n");
-#endif
 }
 static INTERNAL_DEVICE_ATTR(root_id, S_IRUGO, show_root_id, NULL);
 
@@ -291,140 +204,65 @@ static INTERNAL_DEVICE_ATTR(bridge_id, S_IRUGO, show_bridge_id, NULL);
 
 static ssize_t show_root_port(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       return sprintf(buf, "%d\n", to_bridge(d)->root_port);
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static INTERNAL_DEVICE_ATTR(root_port, S_IRUGO, show_root_port, NULL);
 
 static ssize_t show_root_path_cost(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       return sprintf(buf, "%d\n", to_bridge(d)->root_path_cost);
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static INTERNAL_DEVICE_ATTR(root_path_cost, S_IRUGO, show_root_path_cost, NULL);
 
 static ssize_t show_topology_change(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       return sprintf(buf, "%d\n", to_bridge(d)->topology_change);
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static INTERNAL_DEVICE_ATTR(topology_change, S_IRUGO, show_topology_change, NULL);
 
 static ssize_t show_topology_change_detected(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       struct datapath *dp = sysfs_get_dp(to_net_dev(d));
-       return sprintf(buf, "%d\n", br->topology_change_detected);
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static INTERNAL_DEVICE_ATTR(topology_change_detected, S_IRUGO,
                   show_topology_change_detected, NULL);
 
 static ssize_t show_hello_timer(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       struct datapath *dp = sysfs_get_dp(to_net_dev(d));
-       return sprintf(buf, "%ld\n", br_timer_value(&br->hello_timer));
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static INTERNAL_DEVICE_ATTR(hello_timer, S_IRUGO, show_hello_timer, NULL);
 
 static ssize_t show_tcn_timer(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       struct datapath *dp = sysfs_get_dp(to_net_dev(d));
-       return sprintf(buf, "%ld\n", br_timer_value(&br->tcn_timer));
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static INTERNAL_DEVICE_ATTR(tcn_timer, S_IRUGO, show_tcn_timer, NULL);
 
 static ssize_t show_topology_change_timer(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       struct datapath *dp = sysfs_get_dp(to_net_dev(d));
-       return sprintf(buf, "%ld\n", br_timer_value(&br->topology_change_timer));
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static INTERNAL_DEVICE_ATTR(topology_change_timer, S_IRUGO, show_topology_change_timer,
                   NULL);
 
 static ssize_t show_gc_timer(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       struct datapath *dp = sysfs_get_dp(to_net_dev(d));
-       return sprintf(buf, "%ld\n", br_timer_value(&br->gc_timer));
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static INTERNAL_DEVICE_ATTR(gc_timer, S_IRUGO, show_gc_timer, NULL);
 
 static ssize_t show_group_addr(DEVICE_PARAMS, char *buf)
 {
-#if 0
-       struct datapath *dp = sysfs_get_dp(to_net_dev(d));
-       return sprintf(buf, "%x:%x:%x:%x:%x:%x\n",
-                      br->group_addr[0], br->group_addr[1],
-                      br->group_addr[2], br->group_addr[3],
-                      br->group_addr[4], br->group_addr[5]);
-#else
        return sprintf(buf, "00:01:02:03:04:05\n");
-#endif
 }
 
 static ssize_t store_group_addr(DEVICE_PARAMS,
                                const char *buf, size_t len)
 {
        struct datapath *dp = sysfs_get_dp(to_net_dev(d));
-#if 0
-       unsigned new_addr[6];
-       int i;
-
-       if (!capable(CAP_NET_ADMIN))
-               return -EPERM;
 
-       if (sscanf(buf, "%x:%x:%x:%x:%x:%x",
-                  &new_addr[0], &new_addr[1], &new_addr[2],
-                  &new_addr[3], &new_addr[4], &new_addr[5]) != 6)
-               return -EINVAL;
-
-       /* Must be 01:80:c2:00:00:0X */
-       for (i = 0; i < 5; i++)
-               if (new_addr[i] != br_group_address[i])
-                       return -EINVAL;
-
-       if (new_addr[5] & ~0xf)
-               return -EINVAL;
-
-       if (new_addr[5] == 1    /* 802.3x Pause address */
-           || new_addr[5] == 2 /* 802.3ad Slow protocols */
-           || new_addr[5] == 3) /* 802.1X PAE address */
-               return -EINVAL;
-
-       spin_lock_bh(&br->lock);
-       for (i = 0; i < 6; i++)
-               br->group_addr[i] = new_addr[i];
-       spin_unlock_bh(&br->lock);
-#else
        printk("%s: xxx attempt to store_group_addr()\n", dp_name(dp));
-#endif
        return len;
 }
 

diff --git a/datapath/dp_sysfs_if.c b/datapath/dp_sysfs_if.c
index e06037cbe5be94d8e06b2199b6974d80a6f428e9..8aa03a7672f993b8f5a618b544b2ed18f4e421b1 100644 (file)
--- a/datapath/dp_sysfs_if.c
+++ b/datapath/dp_sysfs_if.c
@@ -17,7 +17,6 @@
 #include <linux/netdevice.h>
 #include <linux/if_bridge.h>
 #include <linux/rtnetlink.h>
-#include <linux/spinlock.h>
 
 #include "datapath.h"
 #include "dp_sysfs.h"
@@ -42,17 +41,10 @@ struct brport_attribute brport_attr_##_name = {             \
 
 static ssize_t show_path_cost(struct dp_port *p, char *buf)
 {
-#if 0
-       return sprintf(buf, "%d\n", p->path_cost);
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static ssize_t store_path_cost(struct dp_port *p, unsigned long v)
 {
-#if 0
-       br_stp_set_path_cost(p, v);
-#endif
        return 0;
 }
 static BRPORT_ATTR(path_cost, S_IRUGO | S_IWUSR,
@@ -60,19 +52,10 @@ static BRPORT_ATTR(path_cost, S_IRUGO | S_IWUSR,
 
 static ssize_t show_priority(struct dp_port *p, char *buf)
 {
-#if 0
-       return sprintf(buf, "%d\n", p->priority);
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static ssize_t store_priority(struct dp_port *p, unsigned long v)
 {
-#if 0
-       if (v >= (1<<(16-BR_PORT_BITS)))
-               return -ERANGE;
-       br_stp_set_port_priority(p, v);
-#endif
        return 0;
 }
 static BRPORT_ATTR(priority, S_IRUGO | S_IWUSR,
@@ -80,51 +63,31 @@ static BRPORT_ATTR(priority, S_IRUGO | S_IWUSR,
 
 static ssize_t show_designated_root(struct dp_port *p, char *buf)
 {
-#if 0
-       return br_show_bridge_id(buf, &p->designated_root);
-#else
        return sprintf(buf, "0000.010203040506\n");
-#endif
 }
 static BRPORT_ATTR(designated_root, S_IRUGO, show_designated_root, NULL);
 
 static ssize_t show_designated_bridge(struct dp_port *p, char *buf)
 {
-#if 0
-       return br_show_bridge_id(buf, &p->designated_bridge);
-#else
        return sprintf(buf, "0000.060504030201\n");
-#endif
 }
 static BRPORT_ATTR(designated_bridge, S_IRUGO, show_designated_bridge, NULL);
 
 static ssize_t show_designated_port(struct dp_port *p, char *buf)
 {
-#if 0
-       return sprintf(buf, "%d\n", p->designated_port);
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(designated_port, S_IRUGO, show_designated_port, NULL);
 
 static ssize_t show_designated_cost(struct dp_port *p, char *buf)
 {
-#if 0
-       return sprintf(buf, "%d\n", p->designated_cost);
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(designated_cost, S_IRUGO, show_designated_cost, NULL);
 
 static ssize_t show_port_id(struct dp_port *p, char *buf)
 {
-#if 0
-       return sprintf(buf, "0x%x\n", p->port_id);
-#else
        return sprintf(buf, "0x%x\n", 0);
-#endif
 }
 static BRPORT_ATTR(port_id, S_IRUGO, show_port_id, NULL);
 
@@ -137,64 +100,40 @@ static BRPORT_ATTR(port_no, S_IRUGO, show_port_no, NULL);
 
 static ssize_t show_change_ack(struct dp_port *p, char *buf)
 {
-#if 0
-       return sprintf(buf, "%d\n", p->topology_change_ack);
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(change_ack, S_IRUGO, show_change_ack, NULL);
 
 static ssize_t show_config_pending(struct dp_port *p, char *buf)
 {
-#if 0
-       return sprintf(buf, "%d\n", p->config_pending);
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(config_pending, S_IRUGO, show_config_pending, NULL);
 
 static ssize_t show_port_state(struct dp_port *p, char *buf)
 {
-#if 0
-       return sprintf(buf, "%d\n", p->state);
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(state, S_IRUGO, show_port_state, NULL);
 
 static ssize_t show_message_age_timer(struct dp_port *p,
                                            char *buf)
 {
-#if 0
-       return sprintf(buf, "%ld\n", br_timer_value(&p->message_age_timer));
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(message_age_timer, S_IRUGO, show_message_age_timer, NULL);
 
 static ssize_t show_forward_delay_timer(struct dp_port *p,
                                            char *buf)
 {
-#if 0
-       return sprintf(buf, "%ld\n", br_timer_value(&p->forward_delay_timer));
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(forward_delay_timer, S_IRUGO, show_forward_delay_timer, NULL);
 
 static ssize_t show_hold_timer(struct dp_port *p,
                                            char *buf)
 {
-#if 0
-       return sprintf(buf, "%ld\n", br_timer_value(&p->hold_timer));
-#else
        return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(hold_timer, S_IRUGO, show_hold_timer, NULL);
 
@@ -233,33 +172,14 @@ static ssize_t brport_store(struct kobject * kobj,
                            const char * buf, size_t count)
 {
        struct dp_port * p = to_brport(kobj);
-#if 0
-       struct brport_attribute * brport_attr = to_brport_attr(attr);
-       char *endp;
-       unsigned long val;
-#endif
        ssize_t ret = -EINVAL;
 
        if (!capable(CAP_NET_ADMIN))
                return -EPERM;
 
-#if 0
-       val = simple_strtoul(buf, &endp, 0);
-       if (endp != buf) {
-               rtnl_lock();
-               if (p->dev && p->br && brport_attr->store) {
-                       spin_lock_bh(&p->br->lock);
-                       ret = brport_attr->store(p, val);
-                       spin_unlock_bh(&p->br->lock);
-                       if (ret == 0)
-                               ret = count;
-               }
-               rtnl_unlock();
-       }
-#else
        printk("%s: xxx writing port parms not supported yet!\n", 
               dp_name(p->dp));
-#endif
+
        return ret;
 }
 

diff --git a/datapath/flow.c b/datapath/flow.c
index 95cc042803b817fe7d81ef4293980e579d166d28..a9c742208d6401942ad49cc8c14bef0e958115ef 100644 (file)
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -92,11 +92,6 @@ static inline int icmphdr_ok(struct sk_buff *skb)
 #define TCP_FLAGS_OFFSET 13
 #define TCP_FLAG_MASK 0x3f
 
-static inline struct ovs_tcphdr *ovs_tcp_hdr(const struct sk_buff *skb)
-{
-       return (struct ovs_tcphdr *)skb_transport_header(skb);
-}
-
 void flow_used(struct sw_flow *flow, struct sk_buff *skb)
 {
        u8 tcp_flags = 0;