diff options
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: | |||
129 | bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie) | 129 | bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie) |
130 | { | 130 | { |
131 | return (ie->mesh_config->meshconf_cap & | 131 | return (ie->mesh_config->meshconf_cap & |
132 | MESHCONF_CAPAB_ACCEPT_PLINKS) != 0; | 132 | IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS) != 0; |
133 | } | 133 | } |
134 | 134 | ||
135 | /** | 135 | /** |
@@ -269,11 +269,11 @@ mesh_add_meshconf_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) | |||
269 | neighbors = (neighbors > 15) ? 15 : neighbors; | 269 | neighbors = (neighbors > 15) ? 15 : neighbors; |
270 | *pos++ = neighbors << 1; | 270 | *pos++ = neighbors << 1; |
271 | /* Mesh capability */ | 271 | /* Mesh capability */ |
272 | *pos = MESHCONF_CAPAB_FORWARDING; | 272 | *pos = IEEE80211_MESHCONF_CAPAB_FORWARDING; |
273 | *pos |= ifmsh->accepting_plinks ? | 273 | *pos |= ifmsh->accepting_plinks ? |
274 | MESHCONF_CAPAB_ACCEPT_PLINKS : 0x00; | 274 | IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS : 0x00; |
275 | *pos++ |= ifmsh->adjusting_tbtt ? | 275 | *pos++ |= ifmsh->adjusting_tbtt ? |
276 | MESHCONF_CAPAB_TBTT_ADJUSTING : 0x00; | 276 | IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING : 0x00; |
277 | *pos++ = 0x00; | 277 | *pos++ = 0x00; |
278 | 278 | ||
279 | return 0; | 279 | return 0; |