From: Kalle Valo <kalle.valo@iki.fi>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 2/3] Staging: stlc45xx: update mac80211 bss_info_changed() API change
Date: Mon, 08 Jun 2009 22:09:09 +0300 [thread overview]
Message-ID: <20090608190909.25081.11339.stgit@tikku> (raw)
In-Reply-To: <20090608190901.25081.26264.stgit@tikku>
config_interface() is now gone and the functionality needs go to
bss_info_changed().
Compile-tested only.
Signed-off-by: Kalle Valo <kalle.valo@iki.fi>
---
drivers/staging/stlc45xx/stlc45xx.c | 40 +++++++++++------------------------
1 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/drivers/staging/stlc45xx/stlc45xx.c b/drivers/staging/stlc45xx/stlc45xx.c
index 172eb54..f449256 100644
--- a/drivers/staging/stlc45xx/stlc45xx.c
+++ b/drivers/staging/stlc45xx/stlc45xx.c
@@ -2216,33 +2216,6 @@ static void stlc45xx_op_remove_interface(struct ieee80211_hw *hw,
mutex_unlock(&stlc->mutex);
}
-static int stlc45xx_op_config_interface(struct ieee80211_hw *hw,
- struct ieee80211_vif *vif,
- struct ieee80211_if_conf *conf)
-{
- struct stlc45xx *stlc = hw->priv;
-
- stlc45xx_debug(DEBUG_FUNC, "%s", __func__);
-
- mutex_lock(&stlc->mutex);
-
- if (conf->changed & IEEE80211_IFCC_BSSID) {
- memcpy(stlc->bssid, conf->bssid, ETH_ALEN);
- stlc45xx_tx_setup(stlc);
- }
-
- if (conf->changed & IEEE80211_IFCC_BEACON) {
- stlc45xx_debug(DEBUG_FUNC, "BEACON!");
- stlc45xx_tx_scan(stlc);
- stlc45xx_tx_beacon(hw,vif);
- stlc45xx_tx_edcf(stlc);
- }
-
- mutex_unlock(&stlc->mutex);
-
- return 0;
-}
-
static int stlc45xx_op_config(struct ieee80211_hw *hw, u32 changed)
{
struct stlc45xx *stlc = hw->priv;
@@ -2284,6 +2257,18 @@ static void stlc45xx_op_bss_info_changed(struct ieee80211_hw *hw,
{
struct stlc45xx *stlc = hw->priv;
+ if (changed & BSS_CHANGED_BSSID) {
+ memcpy(stlc->bssid, info->bssid, ETH_ALEN);
+ stlc45xx_tx_setup(stlc);
+ }
+
+ if (changed & BSS_CHANGED_BEACON) {
+ stlc45xx_debug(DEBUG_FUNC, "BEACON!");
+ stlc45xx_tx_scan(stlc);
+ stlc45xx_tx_beacon(hw,vif);
+ stlc45xx_tx_edcf(stlc);
+ }
+
if (changed & BSS_CHANGED_ASSOC) {
stlc->associated = info->assoc;
if (info->assoc)
@@ -2353,7 +2338,6 @@ static const struct ieee80211_ops stlc45xx_ops = {
.add_interface = stlc45xx_op_add_interface,
.remove_interface = stlc45xx_op_remove_interface,
.config = stlc45xx_op_config,
- .config_interface = stlc45xx_op_config_interface,
.configure_filter = stlc45xx_op_configure_filter,
.tx = stlc45xx_op_tx,
.bss_info_changed = stlc45xx_op_bss_info_changed,
next prev parent reply other threads:[~2009-06-08 19:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-08 19:09 [PATCH 1/3] Staging: stlc45xx: sync with gitorious git tree Kalle Valo
2009-06-08 19:09 ` Kalle Valo [this message]
2009-06-08 19:09 ` [PATCH 3/3] stlc45xx: add TODO Kalle Valo
2009-06-09 0:45 ` [PATCH 1/3] Staging: stlc45xx: sync with gitorious git tree Greg KH
2009-06-09 4:26 ` Kalle Valo
2009-06-09 7:01 ` Greg KH
2009-06-09 11:31 ` Kalle Valo
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=20090608190909.25081.11339.stgit@tikku \
--to=kalle.valo@iki.fi \
--cc=gregkh@suse.de \
--cc=linux-wireless@vger.kernel.org \
/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).