mm: introduce VM_BUG_ON_VMA

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / mesh.c

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 6495a3f0428dae6a93bafea04da26b7390f45599..e9f99c1e3fad5905682a61f978d9897833426fd0 100644 (file)
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -679,7 +679,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh)
                *pos++ = 0x0;
                *pos++ = ieee80211_frequency_to_channel(
                                csa->settings.chandef.chan->center_freq);
-               sdata->csa_counter_offset_beacon[0] = hdr_len + 6;
+               bcn->csa_counter_offsets[0] = hdr_len + 6;
                *pos++ = csa->settings.count;
                *pos++ = WLAN_EID_CHAN_SWITCH_PARAM;
                *pos++ = 6;
@@ -1122,7 +1122,7 @@ static int mesh_fwd_csa_frame(struct ieee80211_sub_if_data *sdata,
        mgmt_fwd = (struct ieee80211_mgmt *) skb_put(skb, len);
 
        /* offset_ttl is based on whether the secondary channel
-        * offset is available or not. Substract 1 from the mesh TTL
+        * offset is available or not. Subtract 1 from the mesh TTL
         * and disable the initiator flag before forwarding.
         */
        offset_ttl = (len < 42) ? 7 : 10;