Commit d6ede678 authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville

libertas: remove mesh_autostart_enabled and sync_channel

mesh_autostart_enabled was nowhere set. Rumor is that this is used in the
OLPC tree, but they never did submit their code upstream.

After removing this code, it turned out that the sync_channel stuff is now
also unused, so get rid of that as well.
Signed-off-by: default avatarHolger Schurig <holgerschurig@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c24ef46e
...@@ -485,20 +485,8 @@ int lbs_process_event(struct lbs_private *priv, u32 event) ...@@ -485,20 +485,8 @@ int lbs_process_event(struct lbs_private *priv, u32 event)
break; break;
case MACREG_INT_CODE_MESH_AUTO_STARTED: case MACREG_INT_CODE_MESH_AUTO_STARTED:
/* Ignore spurious autostart events if autostart is disabled */ /* Ignore spurious autostart events */
if (!priv->mesh_autostart_enabled) { lbs_pr_info("EVENT: MESH_AUTO_STARTED (ignoring)\n");
lbs_pr_info("EVENT: MESH_AUTO_STARTED (ignoring)\n");
break;
}
lbs_pr_info("EVENT: MESH_AUTO_STARTED\n");
priv->mesh_connect_status = LBS_CONNECTED;
if (priv->mesh_open) {
netif_carrier_on(priv->mesh_dev);
if (!priv->tx_pending_len)
netif_wake_queue(priv->mesh_dev);
}
priv->mode = IW_MODE_ADHOC;
schedule_work(&priv->sync_channel);
break; break;
default: default:
......
...@@ -42,11 +42,9 @@ struct lbs_private { ...@@ -42,11 +42,9 @@ struct lbs_private {
u32 mesh_connect_status; u32 mesh_connect_status;
struct lbs_mesh_stats mstats; struct lbs_mesh_stats mstats;
int mesh_open; int mesh_open;
int mesh_autostart_enabled;
uint16_t mesh_tlv; uint16_t mesh_tlv;
u8 mesh_ssid[IEEE80211_MAX_SSID_LEN + 1]; u8 mesh_ssid[IEEE80211_MAX_SSID_LEN + 1];
u8 mesh_ssid_len; u8 mesh_ssid_len;
struct work_struct sync_channel;
/* Monitor mode */ /* Monitor mode */
struct net_device *rtap_net_dev; struct net_device *rtap_net_dev;
......
...@@ -806,18 +806,6 @@ int lbs_exit_auto_deep_sleep(struct lbs_private *priv) ...@@ -806,18 +806,6 @@ int lbs_exit_auto_deep_sleep(struct lbs_private *priv)
return 0; return 0;
} }
static void lbs_sync_channel_worker(struct work_struct *work)
{
struct lbs_private *priv = container_of(work, struct lbs_private,
sync_channel);
lbs_deb_enter(LBS_DEB_MAIN);
if (lbs_update_channel(priv))
lbs_pr_info("Channel synchronization failed.");
lbs_deb_leave(LBS_DEB_MAIN);
}
static int lbs_init_adapter(struct lbs_private *priv) static int lbs_init_adapter(struct lbs_private *priv)
{ {
size_t bufsize; size_t bufsize;
...@@ -997,7 +985,6 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev) ...@@ -997,7 +985,6 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)
INIT_DELAYED_WORK(&priv->assoc_work, lbs_association_worker); INIT_DELAYED_WORK(&priv->assoc_work, lbs_association_worker);
INIT_DELAYED_WORK(&priv->scan_work, lbs_scan_worker); INIT_DELAYED_WORK(&priv->scan_work, lbs_scan_worker);
INIT_WORK(&priv->mcast_work, lbs_set_mcast_worker); INIT_WORK(&priv->mcast_work, lbs_set_mcast_worker);
INIT_WORK(&priv->sync_channel, lbs_sync_channel_worker);
priv->mesh_open = 0; priv->mesh_open = 0;
sprintf(priv->mesh_ssid, "mesh"); sprintf(priv->mesh_ssid, "mesh");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment