aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_iface.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-08-28 17:01:54 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:48:52 -0400
commitf658eb90d065c2d76ab3f3eb676ebf53462e323b (patch)
treeff6cbdfc690114390c073fe94c5a28e27046ee78 /net/mac80211/ieee80211_iface.c
parent8f37171a6243a8370211a1e86d58be683ccf01f0 (diff)
[MAC80211] key handling: remove default_wep_only
Remove the default_wep_only stuff, this wasn't really done well and no current driver actually cares. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Michael Wu <flamingice@sourmilk.net> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/ieee80211_iface.c')
-rw-r--r--net/mac80211/ieee80211_iface.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/mac80211/ieee80211_iface.c b/net/mac80211/ieee80211_iface.c
index 3e59afa23e4e..8bb85f194385 100644
--- a/net/mac80211/ieee80211_iface.c
+++ b/net/mac80211/ieee80211_iface.c
@@ -88,8 +88,6 @@ int ieee80211_if_add(struct net_device *dev, const char *name,
88 *new_dev = ndev; 88 *new_dev = ndev;
89 write_unlock_bh(&local->sub_if_lock); 89 write_unlock_bh(&local->sub_if_lock);
90 90
91 ieee80211_update_default_wep_only(local);
92
93 return 0; 91 return 0;
94 92
95fail: 93fail:
@@ -154,7 +152,6 @@ void ieee80211_if_del_mgmt(struct ieee80211_local *local)
154void ieee80211_if_set_type(struct net_device *dev, int type) 152void ieee80211_if_set_type(struct net_device *dev, int type)
155{ 153{
156 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); 154 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
157 struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
158 int oldtype = sdata->type; 155 int oldtype = sdata->type;
159 156
160 dev->hard_start_xmit = ieee80211_subif_start_xmit; 157 dev->hard_start_xmit = ieee80211_subif_start_xmit;
@@ -205,7 +202,6 @@ void ieee80211_if_set_type(struct net_device *dev, int type)
205 dev->name, __FUNCTION__, type); 202 dev->name, __FUNCTION__, type);
206 } 203 }
207 ieee80211_debugfs_change_if_type(sdata, oldtype); 204 ieee80211_debugfs_change_if_type(sdata, oldtype);
208 ieee80211_update_default_wep_only(local);
209} 205}
210 206
211/* Must be called with rtnl lock held. */ 207/* Must be called with rtnl lock held. */
@@ -336,7 +332,6 @@ int ieee80211_if_remove(struct net_device *dev, const char *name, int id)
336 list_del(&sdata->list); 332 list_del(&sdata->list);
337 write_unlock_bh(&local->sub_if_lock); 333 write_unlock_bh(&local->sub_if_lock);
338 __ieee80211_if_del(local, sdata); 334 __ieee80211_if_del(local, sdata);
339 ieee80211_update_default_wep_only(local);
340 return 0; 335 return 0;
341 } 336 }
342 } 337 }