Commit f6387184 authored by Alexander Beregalov's avatar Alexander Beregalov Committed by Greg Kroah-Hartman

Staging: stlc45xx: convert config_interface to bss_info_changed, fixing a build error

See commit 2d0ddec5 (mac80211: unify config_interface and
bss_info_changed)

This fixes a build error.
Signed-off-by: default avatarAlexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8231eb56
...@@ -2235,24 +2235,6 @@ static void stlc45xx_op_remove_interface(struct ieee80211_hw *hw, ...@@ -2235,24 +2235,6 @@ static void stlc45xx_op_remove_interface(struct ieee80211_hw *hw,
stlc45xx_debug(DEBUG_FUNC, "%s", __func__); stlc45xx_debug(DEBUG_FUNC, "%s", __func__);
} }
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);
memcpy(stlc->bssid, conf->bssid, ETH_ALEN);
stlc45xx_tx_setup(stlc);
mutex_unlock(&stlc->mutex);
return 0;
}
static int stlc45xx_op_config(struct ieee80211_hw *hw, u32 changed) static int stlc45xx_op_config(struct ieee80211_hw *hw, u32 changed)
{ {
struct stlc45xx *stlc = hw->priv; struct stlc45xx *stlc = hw->priv;
...@@ -2295,6 +2277,14 @@ static void stlc45xx_op_bss_info_changed(struct ieee80211_hw *hw, ...@@ -2295,6 +2277,14 @@ static void stlc45xx_op_bss_info_changed(struct ieee80211_hw *hw,
{ {
struct stlc45xx *stlc = hw->priv; struct stlc45xx *stlc = hw->priv;
stlc45xx_debug(DEBUG_FUNC, "%s", __func__);
mutex_lock(&stlc->mutex);
memcpy(stlc->bssid, info->bssid, ETH_ALEN);
stlc45xx_tx_setup(stlc);
mutex_unlock(&stlc->mutex);
if (changed & BSS_CHANGED_ASSOC) { if (changed & BSS_CHANGED_ASSOC) {
stlc->associated = info->assoc; stlc->associated = info->assoc;
if (info->assoc) if (info->assoc)
...@@ -2357,7 +2347,6 @@ static const struct ieee80211_ops stlc45xx_ops = { ...@@ -2357,7 +2347,6 @@ static const struct ieee80211_ops stlc45xx_ops = {
.add_interface = stlc45xx_op_add_interface, .add_interface = stlc45xx_op_add_interface,
.remove_interface = stlc45xx_op_remove_interface, .remove_interface = stlc45xx_op_remove_interface,
.config = stlc45xx_op_config, .config = stlc45xx_op_config,
.config_interface = stlc45xx_op_config_interface,
.configure_filter = stlc45xx_op_configure_filter, .configure_filter = stlc45xx_op_configure_filter,
.tx = stlc45xx_op_tx, .tx = stlc45xx_op_tx,
.bss_info_changed = stlc45xx_op_bss_info_changed, .bss_info_changed = stlc45xx_op_bss_info_changed,
......
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