1 files changed, 3 insertions, 1 deletions

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 8bad414c52ad..19205c821dee 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -254,6 +254,8 @@ int mesh_add_meshconf_ie(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
         u8 *pos, neighbors;
         u8 meshconf_len = sizeof(struct ieee80211_meshconf_ie);
+        bool is_connected_to_gate = ifmsh->num_gates > 0 ||
+                ifmsh->mshcfg.dot11MeshGateAnnouncementProtocol;
 
         if (skb_tailroom(skb) < 2 + meshconf_len)
                 return -ENOMEM;
@@ -278,7 +280,7 @@ int mesh_add_meshconf_ie(struct ieee80211_sub_if_data *sdata,
         /* Mesh Formation Info - number of neighbors */
         neighbors = atomic_read(&ifmsh->estab_plinks);
         neighbors = min_t(int, neighbors, IEEE80211_MAX_MESH_PEERINGS);
-        *pos++ = neighbors << 1;
+        *pos++ = (neighbors << 1) | is_connected_to_gate;
         /* Mesh capability */
         *pos = 0x00;
         *pos |= ifmsh->mshcfg.dot11MeshForwarding ?