These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / mac80211 / ocb.c

diff --git a/kernel/net/mac80211/ocb.c b/kernel/net/mac80211/ocb.c
index 358d5f9..0be0aad 100644 (file)
--- a/kernel/net/mac80211/ocb.c
+++ b/kernel/net/mac80211/ocb.c
@@ -75,7 +75,7 @@ void ieee80211_ocb_rx_no_sta(struct ieee80211_sub_if_data *sdata,
        if (!sta)
                return;
 
-       sta->last_rx = jiffies;
+       sta->rx_stats.last_rx = jiffies;
 
        /* Add only mandatory rates for now */
        sband = local->hw.wiphy->bands[band];
@@ -179,7 +179,7 @@ int ieee80211_ocb_join(struct ieee80211_sub_if_data *sdata,
 {
        struct ieee80211_local *local = sdata->local;
        struct ieee80211_if_ocb *ifocb = &sdata->u.ocb;
-       u32 changed = BSS_CHANGED_OCB;
+       u32 changed = BSS_CHANGED_OCB | BSS_CHANGED_BSSID;
        int err;
 
        if (ifocb->joined == true)