diff options
author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-03-18 06:26:40 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-03-23 16:50:23 -0400 |
commit | c76a0d6c9357d3e6ac32793b89a0a303966e1c4c (patch) | |
tree | 7f2f6a1f5c4dd15bb57b23478c87feabca69a58a /drivers/net/wireless/wl12xx | |
parent | 1b72aecd950c4c3cec2d66dbe5436c9e25a487b7 (diff) |
wl1271: Remove deprecated interface config function
It's no longer needed.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index d8cb51410b2f..688009ba94fa 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c | |||
@@ -1088,73 +1088,6 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw, | |||
1088 | mutex_unlock(&wl->mutex); | 1088 | mutex_unlock(&wl->mutex); |
1089 | } | 1089 | } |
1090 | 1090 | ||
1091 | #if 0 | ||
1092 | static int wl1271_op_config_interface(struct ieee80211_hw *hw, | ||
1093 | struct ieee80211_vif *vif, | ||
1094 | struct ieee80211_if_conf *conf) | ||
1095 | { | ||
1096 | struct wl1271 *wl = hw->priv; | ||
1097 | struct sk_buff *beacon; | ||
1098 | int ret; | ||
1099 | |||
1100 | wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %pM", | ||
1101 | conf->bssid); | ||
1102 | wl1271_dump_ascii(DEBUG_MAC80211, "ssid: ", conf->ssid, | ||
1103 | conf->ssid_len); | ||
1104 | |||
1105 | mutex_lock(&wl->mutex); | ||
1106 | |||
1107 | ret = wl1271_ps_elp_wakeup(wl, false); | ||
1108 | if (ret < 0) | ||
1109 | goto out; | ||
1110 | |||
1111 | if (memcmp(wl->bssid, conf->bssid, ETH_ALEN)) { | ||
1112 | wl1271_debug(DEBUG_MAC80211, "bssid changed"); | ||
1113 | |||
1114 | memcpy(wl->bssid, conf->bssid, ETH_ALEN); | ||
1115 | |||
1116 | ret = wl1271_cmd_join(wl, wl->bss_type); | ||
1117 | if (ret < 0) | ||
1118 | goto out_sleep; | ||
1119 | |||
1120 | ret = wl1271_cmd_build_null_data(wl); | ||
1121 | if (ret < 0) | ||
1122 | goto out_sleep; | ||
1123 | } | ||
1124 | |||
1125 | wl->ssid_len = conf->ssid_len; | ||
1126 | if (wl->ssid_len) | ||
1127 | memcpy(wl->ssid, conf->ssid, wl->ssid_len); | ||
1128 | |||
1129 | if (conf->changed & IEEE80211_IFCC_BEACON) { | ||
1130 | beacon = ieee80211_beacon_get(hw, vif); | ||
1131 | ret = wl1271_cmd_template_set(wl, CMD_TEMPL_BEACON, | ||
1132 | beacon->data, beacon->len); | ||
1133 | |||
1134 | if (ret < 0) { | ||
1135 | dev_kfree_skb(beacon); | ||
1136 | goto out_sleep; | ||
1137 | } | ||
1138 | |||
1139 | ret = wl1271_cmd_template_set(wl, CMD_TEMPL_PROBE_RESPONSE, | ||
1140 | beacon->data, beacon->len); | ||
1141 | |||
1142 | dev_kfree_skb(beacon); | ||
1143 | |||
1144 | if (ret < 0) | ||
1145 | goto out_sleep; | ||
1146 | } | ||
1147 | |||
1148 | out_sleep: | ||
1149 | wl1271_ps_elp_sleep(wl); | ||
1150 | |||
1151 | out: | ||
1152 | mutex_unlock(&wl->mutex); | ||
1153 | |||
1154 | return ret; | ||
1155 | } | ||
1156 | #endif | ||
1157 | |||
1158 | static int wl1271_join_channel(struct wl1271 *wl, int channel) | 1091 | static int wl1271_join_channel(struct wl1271 *wl, int channel) |
1159 | { | 1092 | { |
1160 | int ret = 0; | 1093 | int ret = 0; |
@@ -1940,7 +1873,6 @@ static const struct ieee80211_ops wl1271_ops = { | |||
1940 | .add_interface = wl1271_op_add_interface, | 1873 | .add_interface = wl1271_op_add_interface, |
1941 | .remove_interface = wl1271_op_remove_interface, | 1874 | .remove_interface = wl1271_op_remove_interface, |
1942 | .config = wl1271_op_config, | 1875 | .config = wl1271_op_config, |
1943 | /* .config_interface = wl1271_op_config_interface, */ | ||
1944 | .prepare_multicast = wl1271_op_prepare_multicast, | 1876 | .prepare_multicast = wl1271_op_prepare_multicast, |
1945 | .configure_filter = wl1271_op_configure_filter, | 1877 | .configure_filter = wl1271_op_configure_filter, |
1946 | .tx = wl1271_op_tx, | 1878 | .tx = wl1271_op_tx, |