diff options
| author | Marco Porsch <marco.porsch@etit.tu-chemnitz.de> | 2012-11-21 18:40:30 -0800 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-11-26 11:35:21 +0100 |
| commit | 65821635d26d3173a3b22781e2c60d5e6fcaeb22 (patch) | |
| tree | 345dcc01998acaea38ed013b873f61ad6f771190 /net/mac80211/mesh.c | |
| parent | 7bed20503f62ae9660c7b5cd6c3603960e422450 (diff) | |
| download | linux-65821635d26d3173a3b22781e2c60d5e6fcaeb22.tar.bz2 | |
mac80211: move Mesh Capability field definition to ieee80211.h
Signed-off-by: Marco Porsch <marco.porsch@etit.tu-chemnitz.de>
[prefix with IEEE80211_]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index a350cab4b339..943694a52624 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -129,7 +129,7 @@ mismatch: bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie) { return (ie->mesh_config->meshconf_cap & - MESHCONF_CAPAB_ACCEPT_PLINKS) != 0; + IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS) != 0; } /** @@ -269,11 +269,11 @@ mesh_add_meshconf_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) neighbors = (neighbors > 15) ? 15 : neighbors; *pos++ = neighbors << 1; /* Mesh capability */ - *pos = MESHCONF_CAPAB_FORWARDING; + *pos = IEEE80211_MESHCONF_CAPAB_FORWARDING; *pos |= ifmsh->accepting_plinks ? - MESHCONF_CAPAB_ACCEPT_PLINKS : 0x00; + IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS : 0x00; *pos++ |= ifmsh->adjusting_tbtt ? - MESHCONF_CAPAB_TBTT_ADJUSTING : 0x00; + IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING : 0x00; *pos++ = 0x00; return 0; |