diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-07-30 13:44:12 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-31 10:18:59 -0400 |
| commit | c405c6298eacd423098afacf6020ddbda1b0378b (patch) | |
| tree | e85dc0a9e88c041a7629c6e77e6e619bbe141704 | |
| parent | 2d56577bc68e56097a1cd6599b678e8cab758e64 (diff) | |
mac80211: manage carrier state in mesh
Instead of assuming the carrier is on all
the time in mesh manage it with joining
and leaving the mesh.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/iface.c | 12 | ||||
| -rw-r--r-- | net/mac80211/mesh.c | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index fc8ba83e2c33..c65a03ba809f 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
| @@ -539,12 +539,16 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) | |||
| 539 | changed |= ieee80211_reset_erp_info(sdata); | 539 | changed |= ieee80211_reset_erp_info(sdata); |
| 540 | ieee80211_bss_info_change_notify(sdata, changed); | 540 | ieee80211_bss_info_change_notify(sdata, changed); |
| 541 | 541 | ||
| 542 | if (sdata->vif.type == NL80211_IFTYPE_STATION || | 542 | switch (sdata->vif.type) { |
| 543 | sdata->vif.type == NL80211_IFTYPE_ADHOC || | 543 | case NL80211_IFTYPE_STATION: |
| 544 | sdata->vif.type == NL80211_IFTYPE_AP) | 544 | case NL80211_IFTYPE_ADHOC: |
| 545 | case NL80211_IFTYPE_AP: | ||
| 546 | case NL80211_IFTYPE_MESH_POINT: | ||
| 545 | netif_carrier_off(dev); | 547 | netif_carrier_off(dev); |
| 546 | else | 548 | break; |
| 549 | default: | ||
| 547 | netif_carrier_on(dev); | 550 | netif_carrier_on(dev); |
| 551 | } | ||
| 548 | 552 | ||
| 549 | /* | 553 | /* |
| 550 | * set default queue parameters so drivers don't | 554 | * set default queue parameters so drivers don't |
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 03f1696d7d98..571d5183060e 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c | |||
| @@ -610,6 +610,8 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata) | |||
| 610 | BSS_CHANGED_HT | | 610 | BSS_CHANGED_HT | |
| 611 | BSS_CHANGED_BASIC_RATES | | 611 | BSS_CHANGED_BASIC_RATES | |
| 612 | BSS_CHANGED_BEACON_INT); | 612 | BSS_CHANGED_BEACON_INT); |
| 613 | |||
| 614 | netif_carrier_on(sdata->dev); | ||
| 613 | } | 615 | } |
| 614 | 616 | ||
| 615 | void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata) | 617 | void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata) |
| @@ -617,6 +619,8 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata) | |||
| 617 | struct ieee80211_local *local = sdata->local; | 619 | struct ieee80211_local *local = sdata->local; |
| 618 | struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; | 620 | struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; |
| 619 | 621 | ||
| 622 | netif_carrier_off(sdata->dev); | ||
| 623 | |||
| 620 | ifmsh->mesh_id_len = 0; | 624 | ifmsh->mesh_id_len = 0; |
| 621 | ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED); | 625 | ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED); |
| 622 | sta_info_flush(local, NULL); | 626 | sta_info_flush(local, NULL); |