datapath: Omit SNAT-specific data when SNAT is not enabled.

This saves a few bytes of memory but it also makes it clear to the reader
what data is used for what.

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 1c34f9279e92972e572e6e4877d1bfd6062dabe0..0fc4ad277b2ed662e41b963cbd19df6ecb11e901 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -353,7 +353,9 @@ static int new_nbp(struct datapath *dp, struct net_device *dev, int port_no)
        dev_set_promiscuity(dev, 1);
        dev_hold(dev);
        p->port_no = port_no;
+#ifdef SUPPORT_SNAT
        spin_lock_init(&p->lock);
+#endif
        p->dp = dp;
        p->dev = dev;
        if (port_no != ODPP_LOCAL)

diff --git a/datapath/datapath.h b/datapath/datapath.h
index 30f6e5fc9b4b55d5a74dc62a130ee4c96e35908d..416821b34a7f86d5285ba18392ed32a52c8e9491 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -89,11 +89,13 @@ struct datapath {
 
 struct net_bridge_port {
        u16 port_no;
-       spinlock_t lock;
        struct datapath *dp;
        struct net_device *dev;
        struct kobject kobj;
-       struct snat_conf *snat;  /* Only set if SNAT is configured for this port. */
+#ifdef SUPPORT_SNAT
+       spinlock_t lock;
+       struct snat_conf *snat;
+#endif
        struct list_head node;   /* Element in datapath.ports. */
 };