diff options
| author | Alexander Beregalov <a.beregalov@gmail.com> | 2009-05-12 07:23:13 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-05-20 14:46:30 -0400 |
| commit | 49ca37e2d29569d7408f3c92f15c4a33e459a987 (patch) | |
| tree | dee6e424bd941e5b61115c8c0638d828b665d11c /drivers | |
| parent | 153e080da6a07ed888a0a59c45e28bc7351407ff (diff) | |
Staging: agnx: switch config_interface to bss_info_changed
Fix this build error:
drivers/staging/agnx/pci.c: In function 'agnx_config_interface':
drivers/staging/agnx/pci.c:315: error: dereferencing pointer to incomplete type
..
drivers/staging/agnx/pci.c:424: error: unknown field 'config_interface' specified in initializer
config_interface was removed in 2d0ddec5b2b
("mac80211: unify config_interface and bss_info_changed")
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/agnx/pci.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/staging/agnx/pci.c b/drivers/staging/agnx/pci.c index 25c0ffd2faa0..43b3fe352616 100644 --- a/drivers/staging/agnx/pci.c +++ b/drivers/staging/agnx/pci.c | |||
| @@ -303,14 +303,18 @@ static int agnx_config(struct ieee80211_hw *dev, u32 changed) | |||
| 303 | return 0; | 303 | return 0; |
| 304 | } | 304 | } |
| 305 | 305 | ||
| 306 | static int agnx_config_interface(struct ieee80211_hw *dev, | 306 | static void agnx_bss_info_changed(struct ieee80211_hw *dev, |
| 307 | struct ieee80211_vif *vif, | 307 | struct ieee80211_vif *vif, |
| 308 | struct ieee80211_if_conf *conf) | 308 | struct ieee80211_bss_conf *conf, |
| 309 | u32 changed) | ||
| 309 | { | 310 | { |
| 310 | struct agnx_priv *priv = dev->priv; | 311 | struct agnx_priv *priv = dev->priv; |
| 311 | void __iomem *ctl = priv->ctl; | 312 | void __iomem *ctl = priv->ctl; |
| 312 | AGNX_TRACE; | 313 | AGNX_TRACE; |
| 313 | 314 | ||
| 315 | if (!(changed & BSS_CHANGED_BSSID)) | ||
| 316 | return; | ||
| 317 | |||
| 314 | spin_lock(&priv->lock); | 318 | spin_lock(&priv->lock); |
| 315 | 319 | ||
| 316 | if (memcmp(conf->bssid, priv->bssid, ETH_ALEN)) { | 320 | if (memcmp(conf->bssid, priv->bssid, ETH_ALEN)) { |
| @@ -323,8 +327,7 @@ static int agnx_config_interface(struct ieee80211_hw *dev, | |||
| 323 | agnx_write32(ctl, AGNX_BM_MTSM, 0xff & ~0x1); | 327 | agnx_write32(ctl, AGNX_BM_MTSM, 0xff & ~0x1); |
| 324 | } | 328 | } |
| 325 | spin_unlock(&priv->lock); | 329 | spin_unlock(&priv->lock); |
| 326 | return 0; | 330 | } /* agnx_bss_info_changed */ |
| 327 | } /* agnx_config_interface */ | ||
| 328 | 331 | ||
| 329 | 332 | ||
| 330 | static void agnx_configure_filter(struct ieee80211_hw *dev, | 333 | static void agnx_configure_filter(struct ieee80211_hw *dev, |
| @@ -422,7 +425,7 @@ static struct ieee80211_ops agnx_ops = { | |||
| 422 | .add_interface = agnx_add_interface, | 425 | .add_interface = agnx_add_interface, |
| 423 | .remove_interface = agnx_remove_interface, | 426 | .remove_interface = agnx_remove_interface, |
| 424 | .config = agnx_config, | 427 | .config = agnx_config, |
| 425 | .config_interface = agnx_config_interface, | 428 | .bss_info_changed = agnx_bss_info_changed, |
| 426 | .configure_filter = agnx_configure_filter, | 429 | .configure_filter = agnx_configure_filter, |
| 427 | .get_stats = agnx_get_stats, | 430 | .get_stats = agnx_get_stats, |
| 428 | .get_tx_stats = agnx_get_tx_stats, | 431 | .get_tx_stats = agnx_get_tx_stats, |