From: Tim Gardner Date: Wed, 29 Apr 2009 21:01:42 +0000 (-0600) Subject: Staging: winbond: mac80211 - unify config_interface and bss_info_changed X-Git-Tag: v2.6.31-rc1~105^2~191 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=24b8a9dfc7746273bde5a2030e4f16391251e830;ds=sidebyside Staging: winbond: mac80211 - unify config_interface and bss_info_changed The commit 'mac80211: unify config_interface and bss_info_changed' from Johannes Berg removed the config_interface structure tag from struct ieee80211_ops. The BSSID detection functionality migrated to ieee80211_ops.bss_info_changed. Since wbsoft_config_interface() was largely empty, there wasn't much to do other then to remove the function itself. There is currently no support for BSSID change detection. Signed-off-by: Tim Gardner Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c index c46ff4717b1f..745279c528a2 100644 --- a/drivers/staging/winbond/wbusb.c +++ b/drivers/staging/winbond/wbusb.c @@ -264,14 +264,6 @@ static int wbsoft_config(struct ieee80211_hw *dev, u32 changed) return 0; } -static int wbsoft_config_interface(struct ieee80211_hw *dev, - struct ieee80211_vif *vif, - struct ieee80211_if_conf *conf) -{ - printk("wbsoft_config_interface called\n"); - return 0; -} - static u64 wbsoft_get_tsf(struct ieee80211_hw *dev) { printk("wbsoft_get_tsf called\n"); @@ -285,7 +277,6 @@ static const struct ieee80211_ops wbsoft_ops = { .add_interface = wbsoft_add_interface, .remove_interface = wbsoft_remove_interface, .config = wbsoft_config, - .config_interface = wbsoft_config_interface, .configure_filter = wbsoft_configure_filter, .get_stats = wbsoft_get_stats, .get_tx_stats = wbsoft_get_tx_stats,