aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas
diff options
context:
space:
mode:
authorHolger Schurig <holgerschurig@googlemail.com>2009-12-02 09:25:57 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-12-22 13:37:12 -0500
commitd6ede678c138061f5202b519f8f8d6372e2cb5bb (patch)
tree7741253e16bb99af08dd6b14de272ab18c585096 /drivers/net/wireless/libertas
parentc24ef46e6b1597e54f185e0b48eb9073ef155a8c (diff)
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: Holger Schurig <holgerschurig@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r--drivers/net/wireless/libertas/cmdresp.c16
-rw-r--r--drivers/net/wireless/libertas/dev.h2
-rw-r--r--drivers/net/wireless/libertas/main.c13
3 files changed, 2 insertions, 29 deletions
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 21d57690c20..0334a58820e 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -485,20 +485,8 @@ int lbs_process_event(struct lbs_private *priv, u32 event)
485 break; 485 break;
486 486
487 case MACREG_INT_CODE_MESH_AUTO_STARTED: 487 case MACREG_INT_CODE_MESH_AUTO_STARTED:
488 /* Ignore spurious autostart events if autostart is disabled */ 488 /* Ignore spurious autostart events */
489 if (!priv->mesh_autostart_enabled) { 489 lbs_pr_info("EVENT: MESH_AUTO_STARTED (ignoring)\n");
490 lbs_pr_info("EVENT: MESH_AUTO_STARTED (ignoring)\n");
491 break;
492 }
493 lbs_pr_info("EVENT: MESH_AUTO_STARTED\n");
494 priv->mesh_connect_status = LBS_CONNECTED;
495 if (priv->mesh_open) {
496 netif_carrier_on(priv->mesh_dev);
497 if (!priv->tx_pending_len)
498 netif_wake_queue(priv->mesh_dev);
499 }
500 priv->mode = IW_MODE_ADHOC;
501 schedule_work(&priv->sync_channel);
502 break; 490 break;
503 491
504 default: 492 default:
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 505b8feaa8b..159de3ec9c4 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -42,11 +42,9 @@ struct lbs_private {
42 u32 mesh_connect_status; 42 u32 mesh_connect_status;
43 struct lbs_mesh_stats mstats; 43 struct lbs_mesh_stats mstats;
44 int mesh_open; 44 int mesh_open;
45 int mesh_autostart_enabled;
46 uint16_t mesh_tlv; 45 uint16_t mesh_tlv;
47 u8 mesh_ssid[IEEE80211_MAX_SSID_LEN + 1]; 46 u8 mesh_ssid[IEEE80211_MAX_SSID_LEN + 1];
48 u8 mesh_ssid_len; 47 u8 mesh_ssid_len;
49 struct work_struct sync_channel;
50 48
51 /* Monitor mode */ 49 /* Monitor mode */
52 struct net_device *rtap_net_dev; 50 struct net_device *rtap_net_dev;
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index db38a5a719f..b0799e347ba 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -806,18 +806,6 @@ int lbs_exit_auto_deep_sleep(struct lbs_private *priv)
806 return 0; 806 return 0;
807} 807}
808 808
809static void lbs_sync_channel_worker(struct work_struct *work)
810{
811 struct lbs_private *priv = container_of(work, struct lbs_private,
812 sync_channel);
813
814 lbs_deb_enter(LBS_DEB_MAIN);
815 if (lbs_update_channel(priv))
816 lbs_pr_info("Channel synchronization failed.");
817 lbs_deb_leave(LBS_DEB_MAIN);
818}
819
820
821static int lbs_init_adapter(struct lbs_private *priv) 809static int lbs_init_adapter(struct lbs_private *priv)
822{ 810{
823 size_t bufsize; 811 size_t bufsize;
@@ -997,7 +985,6 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)
997 INIT_DELAYED_WORK(&priv->assoc_work, lbs_association_worker); 985 INIT_DELAYED_WORK(&priv->assoc_work, lbs_association_worker);
998 INIT_DELAYED_WORK(&priv->scan_work, lbs_scan_worker); 986 INIT_DELAYED_WORK(&priv->scan_work, lbs_scan_worker);
999 INIT_WORK(&priv->mcast_work, lbs_set_mcast_worker); 987 INIT_WORK(&priv->mcast_work, lbs_set_mcast_worker);
1000 INIT_WORK(&priv->sync_channel, lbs_sync_channel_worker);
1001 988
1002 priv->mesh_open = 0; 989 priv->mesh_open = 0;
1003 sprintf(priv->mesh_ssid, "mesh"); 990 sprintf(priv->mesh_ssid, "mesh");