From: Holger Schurig <holgerschurig@googlemail.com>
To: John Linville <linville@tuxdriver.com>,
linux-wireless@vger.kernel.org, Dan Williams <dcbw@redhat.com>
Subject: [PATCH 02/10] libertas: remove mesh_autostart_enabled and sync_channel
Date: Wed, 02 Dec 2009 15:25:57 +0100 [thread overview]
Message-ID: <20091202142912.713940419@gmail.com> (raw)
In-Reply-To: 20091202142555.654873300@gmail.com
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>
--- linux-wl.orig/drivers/net/wireless/libertas/cmdresp.c
+++ linux-wl/drivers/net/wireless/libertas/cmdresp.c
@@ -485,20 +485,8 @@ int lbs_process_event(struct lbs_private
break;
case MACREG_INT_CODE_MESH_AUTO_STARTED:
- /* Ignore spurious autostart events if autostart is disabled */
- if (!priv->mesh_autostart_enabled) {
- 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);
+ /* Ignore spurious autostart events */
+ lbs_pr_info("EVENT: MESH_AUTO_STARTED (ignoring)\n");
break;
default:
--- linux-wl.orig/drivers/net/wireless/libertas/dev.h
+++ linux-wl/drivers/net/wireless/libertas/dev.h
@@ -42,11 +42,9 @@ struct lbs_private {
u32 mesh_connect_status;
struct lbs_mesh_stats mstats;
int mesh_open;
- int mesh_autostart_enabled;
uint16_t mesh_tlv;
u8 mesh_ssid[IEEE80211_MAX_SSID_LEN + 1];
u8 mesh_ssid_len;
- struct work_struct sync_channel;
/* Monitor mode */
struct net_device *rtap_net_dev;
--- linux-wl.orig/drivers/net/wireless/libertas/main.c
+++ linux-wl/drivers/net/wireless/libertas/main.c
@@ -806,18 +806,6 @@ int lbs_exit_auto_deep_sleep(struct lbs_
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)
{
size_t bufsize;
@@ -997,7 +985,6 @@ struct lbs_private *lbs_add_card(void *c
INIT_DELAYED_WORK(&priv->assoc_work, lbs_association_worker);
INIT_DELAYED_WORK(&priv->scan_work, lbs_scan_worker);
INIT_WORK(&priv->mcast_work, lbs_set_mcast_worker);
- INIT_WORK(&priv->sync_channel, lbs_sync_channel_worker);
priv->mesh_open = 0;
sprintf(priv->mesh_ssid, "mesh");
--
next prev parent reply other threads:[~2009-12-02 14:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-02 14:25 [PATCH 00/10] [PATCH] libertas: remove WEXT, add CFG80211 Holger Schurig
2009-12-02 14:25 ` [PATCH 01/10] libertas: use priv->mesh_tlv instead of priv->mesh_fw_ver Holger Schurig
2009-12-02 14:25 ` Holger Schurig [this message]
2009-12-02 14:25 ` [PATCH 03/10] libertas: move mesh-related definitions into mesh.h Holger Schurig
2009-12-02 14:25 ` [PATCH 04/10] libertas: decouple mesh and rtap Holger Schurig
2009-12-02 14:26 ` [PATCH 05/10] libertas: move mesh SSID initialization into mesh.c Holger Schurig
2009-12-02 14:26 ` [PATCH 06/10] libertas: add access functions for mesh open/connect status Holger Schurig
2009-12-02 14:26 ` [PATCH 07/10] libertas: make mesh configurable Holger Schurig
2009-12-02 14:26 ` [PATCH 08/10] libertas: remove priv->capability Holger Schurig
2009-12-02 14:26 ` [PATCH 09/10] libertas: remove priv->ratebitmap Holger Schurig
2009-12-02 14:26 ` [PATCH 10/10] [RFC, v4] libertas: cfg80211 support Holger Schurig
2010-01-25 15:20 ` Samuel Ortiz
2010-01-26 13:20 ` Holger Schurig
2009-12-02 20:45 ` [PATCH 00/10] [PATCH] libertas: remove WEXT, add CFG80211 Dan Williams
2009-12-03 10:02 ` Holger Schurig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091202142912.713940419@gmail.com \
--to=holgerschurig@googlemail.com \
--cc=dcbw@redhat.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).