libertas: only enable mesh when interface is active
authorDaniel Drake <dsd@laptop.org>
Wed, 20 Jul 2011 16:53:56 +0000 (17:53 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 20 Jul 2011 19:04:41 +0000 (15:04 -0400)
Previously, the mesh was running whenever the appropriate hardware
and firmware was present.

Now we only run the mesh when the interface is running.

Also simplifies interface management a little.

Signed-off-by: Daniel Drake <dsd@laptop.org>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/libertas/dev.h
drivers/net/wireless/libertas/main.c
drivers/net/wireless/libertas/mesh.c
drivers/net/wireless/libertas/mesh.h
drivers/net/wireless/libertas/tx.c

index 76d018beebf42e61d4e222ccfd053dd9105b649a..adb3490e3cf52e427210d2c34eb1db2fd1ae247b 100644 (file)
@@ -44,9 +44,7 @@ struct lbs_private {
        /* Mesh */
        struct net_device *mesh_dev; /* Virtual device */
 #ifdef CONFIG_LIBERTAS_MESH
-       u32 mesh_connect_status;
        struct lbs_mesh_stats mstats;
-       int mesh_open;
        uint16_t mesh_tlv;
        u8 mesh_ssid[IEEE80211_MAX_SSID_LEN + 1];
        u8 mesh_ssid_len;
index a839de06fa671c2de03f427bc1944e079e39aace..62b8dcbb4c233f44802f93bd2602f47f0a04d8f8 100644 (file)
@@ -511,7 +511,7 @@ static int lbs_thread(void *data)
                                if (priv->connect_status == LBS_CONNECTED)
                                        netif_wake_queue(priv->dev);
                                if (priv->mesh_dev &&
-                                   lbs_mesh_connected(priv))
+                                   netif_running(priv->mesh_dev))
                                        netif_wake_queue(priv->mesh_dev);
                        }
                }
index ffe9c1e400cf74369455f126c68c6685a34839b8..1d33c5dd91d2cfcf38fab53320322fd7876e3769 100644 (file)
@@ -269,17 +269,11 @@ static ssize_t lbs_mesh_set(struct device *dev,
 {
        struct lbs_private *priv = to_net_dev(dev)->ml_priv;
        int enable;
-       int ret, action = CMD_ACT_MESH_CONFIG_STOP;
 
        sscanf(buf, "%x", &enable);
        enable = !!enable;
        if (enable == !!priv->mesh_dev)
                return count;
-       if (enable)
-               action = CMD_ACT_MESH_CONFIG_START;
-       ret = lbs_mesh_config(priv, action, priv->channel);
-       if (ret)
-               return ret;
 
        if (enable)
                lbs_add_mesh(priv);
@@ -822,8 +816,6 @@ int lbs_init_mesh(struct lbs_private *priv)
 
        lbs_deb_enter(LBS_DEB_MESH);
 
-       priv->mesh_connect_status = LBS_DISCONNECTED;
-
        /* Determine mesh_fw_ver from fwrelease and fwcapinfo */
        /* 5.0.16p0 9.0.0.p0 is known to NOT support any mesh */
        /* 5.110.22 have mesh command with 0xa3 command id */
@@ -863,6 +855,8 @@ int lbs_init_mesh(struct lbs_private *priv)
                        priv->mesh_tlv = 0;
        }
 
+       /* Stop meshing until interface is brought up */
+       lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_STOP, priv->channel);
 
        if (priv->mesh_tlv) {
                sprintf(priv->mesh_ssid, "mesh");
@@ -909,10 +903,9 @@ static int lbs_mesh_stop(struct net_device *dev)
        struct lbs_private *priv = dev->ml_priv;
 
        lbs_deb_enter(LBS_DEB_MESH);
-       spin_lock_irq(&priv->driver_lock);
+       lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_STOP, priv->channel);
 
-       priv->mesh_open = 0;
-       priv->mesh_connect_status = LBS_DISCONNECTED;
+       spin_lock_irq(&priv->driver_lock);
 
        netif_stop_queue(dev);
        netif_carrier_off(dev);
@@ -942,18 +935,20 @@ static int lbs_mesh_dev_open(struct net_device *dev)
 
        if (priv->wdev->iftype == NL80211_IFTYPE_MONITOR) {
                ret = -EBUSY;
+               spin_unlock_irq(&priv->driver_lock);
                goto out;
        }
 
-       priv->mesh_open = 1;
-       priv->mesh_connect_status = LBS_CONNECTED;
        netif_carrier_on(dev);
 
        if (!priv->tx_pending_len)
                netif_wake_queue(dev);
- out:
 
        spin_unlock_irq(&priv->driver_lock);
+
+       ret = lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_START, priv->channel);
+
+out:
        lbs_deb_leave_args(LBS_DEB_NET, "ret %d", ret);
        return ret;
 }
index 7d3dd8171fc02b7d40f02f087d87a8ca7628849f..50144913f2abefd8a86fe93f81e42ed7eeaedcde 100644 (file)
@@ -63,11 +63,6 @@ void lbs_mesh_ethtool_get_strings(struct net_device *dev,
        uint32_t stringset, uint8_t *s);
 
 
-/* Accessors */
-
-#define lbs_mesh_open(priv) (priv->mesh_open)
-#define lbs_mesh_connected(priv) (priv->mesh_connect_status == LBS_CONNECTED)
-
 #else
 
 #define lbs_init_mesh(priv)
@@ -77,8 +72,6 @@ void lbs_mesh_ethtool_get_strings(struct net_device *dev,
 #define lbs_mesh_set_dev(priv, dev, rxpd) (dev)
 #define lbs_mesh_set_txpd(priv, dev, txpd)
 #define lbs_mesh_config(priv, enable, chan)
-#define lbs_mesh_open(priv) (0)
-#define lbs_mesh_connected(priv) (0)
 
 #endif
 
index bbb95f88dc01f0e40a9bfd61bdb21b6cb6191a46..92071ebb20bfd58396d14d25ba45c10e30c94911 100644 (file)
@@ -198,7 +198,7 @@ void lbs_send_tx_feedback(struct lbs_private *priv, u32 try_count)
        if (priv->connect_status == LBS_CONNECTED)
                netif_wake_queue(priv->dev);
 
-       if (priv->mesh_dev && lbs_mesh_connected(priv))
+       if (priv->mesh_dev && netif_running(priv->mesh_dev))
                netif_wake_queue(priv->mesh_dev);
 }
 EXPORT_SYMBOL_GPL(lbs_send_tx_feedback);