1 files changed, 22 insertions, 22 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 990a4b7f6bcc..debf7834dbc6 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -275,7 +275,7 @@ static void mesh_plink_timer(unsigned long data)
                return;
        }
        mpl_dbg("Mesh plink timer for %s fired on state %d\n",
-                        print_mac(mac, sta->addr), sta->plink_state);
+                        print_mac(mac, sta->sta.addr), sta->plink_state);
        reason = 0;
        llid = sta->llid;
        plid = sta->plid;
@@ -288,7 +288,7 @@ static void mesh_plink_timer(unsigned long data)
                if (sta->plink_retries < dot11MeshMaxRetries(sdata)) {
                        u32 rand;
                        mpl_dbg("Mesh plink for %s (retry, timeout): %d %d\n",
-                                        print_mac(mac, sta->addr),
+                                        print_mac(mac, sta->sta.addr),
                                        sta->plink_retries, sta->plink_timeout);
                        get_random_bytes(&rand, sizeof(u32));
                        sta->plink_timeout = sta->plink_timeout +
@@ -296,7 +296,7 @@ static void mesh_plink_timer(unsigned long data)
                        ++sta->plink_retries;
                        mod_plink_timer(sta, sta->plink_timeout);
                        spin_unlock_bh(&sta->lock);
-                        mesh_plink_frame_tx(sdata, PLINK_OPEN, sta->addr, llid,
+                        mesh_plink_frame_tx(sdata, PLINK_OPEN, sta->sta.addr, llid,
                                            0, 0);
                        break;
                }
@@ -309,7 +309,7 @@ static void mesh_plink_timer(unsigned long data)
                sta->plink_state = PLINK_HOLDING;
                mod_plink_timer(sta, dot11MeshHoldingTimeout(sdata));
                spin_unlock_bh(&sta->lock);
-                mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->addr, llid, plid,
+                mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->sta.addr, llid, plid,
                                    reason);
                break;
        case PLINK_HOLDING:
@@ -352,10 +352,10 @@ int mesh_plink_open(struct sta_info *sta)
        mesh_plink_timer_set(sta, dot11MeshRetryTimeout(sdata));
        spin_unlock_bh(&sta->lock);
        mpl_dbg("Mesh plink: starting establishment with %s\n",
-                print_mac(mac, sta->addr));
+                print_mac(mac, sta->sta.addr));
        return mesh_plink_frame_tx(sdata, PLINK_OPEN,
-                                   sta->addr, llid, 0, 0);
+                                   sta->sta.addr, llid, 0, 0);
 }
 void mesh_plink_block(struct sta_info *sta)
@@ -379,7 +379,7 @@ int mesh_plink_close(struct sta_info *sta)
 #endif
        mpl_dbg("Mesh plink: closing link with %s\n",
-                        print_mac(mac, sta->addr));
+                        print_mac(mac, sta->sta.addr));
        spin_lock_bh(&sta->lock);
        sta->reason = cpu_to_le16(MESH_LINK_CANCELLED);
        reason = sta->reason;
@@ -400,7 +400,7 @@ int mesh_plink_close(struct sta_info *sta)
        llid = sta->llid;
        plid = sta->plid;
        spin_unlock_bh(&sta->lock);
-        mesh_plink_frame_tx(sta->sdata, PLINK_CLOSE, sta->addr, llid,
+        mesh_plink_frame_tx(sta->sdata, PLINK_CLOSE, sta->sta.addr, llid,
                            plid, reason);
        return 0;
 }
@@ -577,9 +577,9 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                        sta->llid = llid;
                        mesh_plink_timer_set(sta, dot11MeshRetryTimeout(sdata));
                        spin_unlock_bh(&sta->lock);
-                        mesh_plink_frame_tx(sdata, PLINK_OPEN, sta->addr, llid,
+                        mesh_plink_frame_tx(sdata, PLINK_OPEN, sta->sta.addr, llid,
                                            0, 0);
-                        mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->addr,
+                        mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->sta.addr,
                                            llid, plid, 0);
                        break;
                default:
@@ -604,7 +604,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                        llid = sta->llid;
                        spin_unlock_bh(&sta->lock);
-                        mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->addr, llid,
+                        mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->sta.addr, llid,
                                            plid, reason);
                        break;
                case OPN_ACPT:
@@ -613,7 +613,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                        sta->plid = plid;
                        llid = sta->llid;
                        spin_unlock_bh(&sta->lock);
-                        mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->addr, llid,
+                        mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->sta.addr, llid,
                                            plid, 0);
                        break;
                case CNF_ACPT:
@@ -646,13 +646,13 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                        llid = sta->llid;
                        spin_unlock_bh(&sta->lock);
-                        mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->addr, llid,
+                        mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->sta.addr, llid,
                                            plid, reason);
                        break;
                case OPN_ACPT:
                        llid = sta->llid;
                        spin_unlock_bh(&sta->lock);
-                        mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->addr, llid,
+                        mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->sta.addr, llid,
                                            plid, 0);
                        break;
                case CNF_ACPT:
@@ -661,7 +661,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                        mesh_plink_inc_estab_count(sdata);
                        spin_unlock_bh(&sta->lock);
                        mpl_dbg("Mesh plink with %s ESTABLISHED\n",
-                                        print_mac(mac, sta->addr));
+                                        print_mac(mac, sta->sta.addr));
                        break;
                default:
                        spin_unlock_bh(&sta->lock);
@@ -685,7 +685,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                        llid = sta->llid;
                        spin_unlock_bh(&sta->lock);
-                        mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->addr, llid,
+                        mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->sta.addr, llid,
                                            plid, reason);
                        break;
                case OPN_ACPT:
@@ -694,8 +694,8 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                        mesh_plink_inc_estab_count(sdata);
                        spin_unlock_bh(&sta->lock);
                        mpl_dbg("Mesh plink with %s ESTABLISHED\n",
-                                        print_mac(mac, sta->addr));
+                                        print_mac(mac, sta->sta.addr));
-                        mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->addr, llid,
+                        mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->sta.addr, llid,
                                            plid, 0);
                        break;
                default:
@@ -714,13 +714,13 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                        llid = sta->llid;
                        mod_plink_timer(sta, dot11MeshHoldingTimeout(sdata));
                        spin_unlock_bh(&sta->lock);
-                        mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->addr, llid,
+                        mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->sta.addr, llid,
                                            plid, reason);
                        break;
                case OPN_ACPT:
                        llid = sta->llid;
                        spin_unlock_bh(&sta->lock);
-                        mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->addr, llid,
+                        mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->sta.addr, llid,
                                            plid, 0);
                        break;
                default:
@@ -743,8 +743,8 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                        llid = sta->llid;
                        reason = sta->reason;
                        spin_unlock_bh(&sta->lock);
-                        mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->addr, llid,
+                        mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->sta.addr,
-                                            plid, reason);
+                                            llid, plid, reason);
                        break;
                default:
                        spin_unlock_bh(&sta->lock);

diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 990a4b7f6bcc..debf7834dbc6 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c
@@ -275,7 +275,7 @@ static void mesh_plink_timer(unsigned long data)
275	return;	275	return;
276	}	276	}
277	mpl_dbg("Mesh plink timer for %s fired on state %d\n",	277	mpl_dbg("Mesh plink timer for %s fired on state %d\n",
278	print_mac(mac, sta->addr), sta->plink_state);	278	print_mac(mac, sta->sta.addr), sta->plink_state);
279	reason = 0;	279	reason = 0;
280	llid = sta->llid;	280	llid = sta->llid;
281	plid = sta->plid;	281	plid = sta->plid;
@@ -288,7 +288,7 @@ static void mesh_plink_timer(unsigned long data)
288	if (sta->plink_retries < dot11MeshMaxRetries(sdata)) {	288	if (sta->plink_retries < dot11MeshMaxRetries(sdata)) {
289	u32 rand;	289	u32 rand;
290	mpl_dbg("Mesh plink for %s (retry, timeout): %d %d\n",	290	mpl_dbg("Mesh plink for %s (retry, timeout): %d %d\n",
291	print_mac(mac, sta->addr),	291	print_mac(mac, sta->sta.addr),
292	sta->plink_retries, sta->plink_timeout);	292	sta->plink_retries, sta->plink_timeout);
293	get_random_bytes(&rand, sizeof(u32));	293	get_random_bytes(&rand, sizeof(u32));
294	sta->plink_timeout = sta->plink_timeout +	294	sta->plink_timeout = sta->plink_timeout +
@@ -296,7 +296,7 @@ static void mesh_plink_timer(unsigned long data)
296	++sta->plink_retries;	296	++sta->plink_retries;
297	mod_plink_timer(sta, sta->plink_timeout);	297	mod_plink_timer(sta, sta->plink_timeout);
298	spin_unlock_bh(&sta->lock);	298	spin_unlock_bh(&sta->lock);
299	mesh_plink_frame_tx(sdata, PLINK_OPEN, sta->addr, llid,	299	mesh_plink_frame_tx(sdata, PLINK_OPEN, sta->sta.addr, llid,
300	0, 0);	300	0, 0);
301	break;	301	break;
302	}	302	}
@@ -309,7 +309,7 @@ static void mesh_plink_timer(unsigned long data)
309	sta->plink_state = PLINK_HOLDING;	309	sta->plink_state = PLINK_HOLDING;
310	mod_plink_timer(sta, dot11MeshHoldingTimeout(sdata));	310	mod_plink_timer(sta, dot11MeshHoldingTimeout(sdata));
311	spin_unlock_bh(&sta->lock);	311	spin_unlock_bh(&sta->lock);
312	mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->addr, llid, plid,	312	mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->sta.addr, llid, plid,
313	reason);	313	reason);
314	break;	314	break;
315	case PLINK_HOLDING:	315	case PLINK_HOLDING:
@@ -352,10 +352,10 @@ int mesh_plink_open(struct sta_info *sta)
352	mesh_plink_timer_set(sta, dot11MeshRetryTimeout(sdata));	352	mesh_plink_timer_set(sta, dot11MeshRetryTimeout(sdata));
353	spin_unlock_bh(&sta->lock);	353	spin_unlock_bh(&sta->lock);
354	mpl_dbg("Mesh plink: starting establishment with %s\n",	354	mpl_dbg("Mesh plink: starting establishment with %s\n",
355	print_mac(mac, sta->addr));	355	print_mac(mac, sta->sta.addr));
356		356
357	return mesh_plink_frame_tx(sdata, PLINK_OPEN,	357	return mesh_plink_frame_tx(sdata, PLINK_OPEN,
358	sta->addr, llid, 0, 0);	358	sta->sta.addr, llid, 0, 0);
359	}	359	}
360		360
361	void mesh_plink_block(struct sta_info *sta)	361	void mesh_plink_block(struct sta_info *sta)
@@ -379,7 +379,7 @@ int mesh_plink_close(struct sta_info *sta)
379	#endif	379	#endif
380		380
381	mpl_dbg("Mesh plink: closing link with %s\n",	381	mpl_dbg("Mesh plink: closing link with %s\n",
382	print_mac(mac, sta->addr));	382	print_mac(mac, sta->sta.addr));
383	spin_lock_bh(&sta->lock);	383	spin_lock_bh(&sta->lock);
384	sta->reason = cpu_to_le16(MESH_LINK_CANCELLED);	384	sta->reason = cpu_to_le16(MESH_LINK_CANCELLED);
385	reason = sta->reason;	385	reason = sta->reason;
@@ -400,7 +400,7 @@ int mesh_plink_close(struct sta_info *sta)
400	llid = sta->llid;	400	llid = sta->llid;
401	plid = sta->plid;	401	plid = sta->plid;
402	spin_unlock_bh(&sta->lock);	402	spin_unlock_bh(&sta->lock);
403	mesh_plink_frame_tx(sta->sdata, PLINK_CLOSE, sta->addr, llid,	403	mesh_plink_frame_tx(sta->sdata, PLINK_CLOSE, sta->sta.addr, llid,
404	plid, reason);	404	plid, reason);
405	return 0;	405	return 0;
406	}	406	}
@@ -577,9 +577,9 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
577	sta->llid = llid;	577	sta->llid = llid;
578	mesh_plink_timer_set(sta, dot11MeshRetryTimeout(sdata));	578	mesh_plink_timer_set(sta, dot11MeshRetryTimeout(sdata));
579	spin_unlock_bh(&sta->lock);	579	spin_unlock_bh(&sta->lock);
580	mesh_plink_frame_tx(sdata, PLINK_OPEN, sta->addr, llid,	580	mesh_plink_frame_tx(sdata, PLINK_OPEN, sta->sta.addr, llid,
581	0, 0);	581	0, 0);
582	mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->addr,	582	mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->sta.addr,
583	llid, plid, 0);	583	llid, plid, 0);
584	break;	584	break;
585	default:	585	default:
@@ -604,7 +604,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
604		604
605	llid = sta->llid;	605	llid = sta->llid;
606	spin_unlock_bh(&sta->lock);	606	spin_unlock_bh(&sta->lock);
607	mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->addr, llid,	607	mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->sta.addr, llid,
608	plid, reason);	608	plid, reason);
609	break;	609	break;
610	case OPN_ACPT:	610	case OPN_ACPT:
@@ -613,7 +613,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
613	sta->plid = plid;	613	sta->plid = plid;
614	llid = sta->llid;	614	llid = sta->llid;
615	spin_unlock_bh(&sta->lock);	615	spin_unlock_bh(&sta->lock);
616	mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->addr, llid,	616	mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->sta.addr, llid,
617	plid, 0);	617	plid, 0);
618	break;	618	break;
619	case CNF_ACPT:	619	case CNF_ACPT:
@@ -646,13 +646,13 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
646		646
647	llid = sta->llid;	647	llid = sta->llid;
648	spin_unlock_bh(&sta->lock);	648	spin_unlock_bh(&sta->lock);
649	mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->addr, llid,	649	mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->sta.addr, llid,
650	plid, reason);	650	plid, reason);
651	break;	651	break;
652	case OPN_ACPT:	652	case OPN_ACPT:
653	llid = sta->llid;	653	llid = sta->llid;
654	spin_unlock_bh(&sta->lock);	654	spin_unlock_bh(&sta->lock);
655	mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->addr, llid,	655	mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->sta.addr, llid,
656	plid, 0);	656	plid, 0);
657	break;	657	break;
658	case CNF_ACPT:	658	case CNF_ACPT:
@@ -661,7 +661,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
661	mesh_plink_inc_estab_count(sdata);	661	mesh_plink_inc_estab_count(sdata);
662	spin_unlock_bh(&sta->lock);	662	spin_unlock_bh(&sta->lock);
663	mpl_dbg("Mesh plink with %s ESTABLISHED\n",	663	mpl_dbg("Mesh plink with %s ESTABLISHED\n",
664	print_mac(mac, sta->addr));	664	print_mac(mac, sta->sta.addr));
665	break;	665	break;
666	default:	666	default:
667	spin_unlock_bh(&sta->lock);	667	spin_unlock_bh(&sta->lock);
@@ -685,7 +685,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
685		685
686	llid = sta->llid;	686	llid = sta->llid;
687	spin_unlock_bh(&sta->lock);	687	spin_unlock_bh(&sta->lock);
688	mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->addr, llid,	688	mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->sta.addr, llid,
689	plid, reason);	689	plid, reason);
690	break;	690	break;
691	case OPN_ACPT:	691	case OPN_ACPT:
@@ -694,8 +694,8 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
694	mesh_plink_inc_estab_count(sdata);	694	mesh_plink_inc_estab_count(sdata);
695	spin_unlock_bh(&sta->lock);	695	spin_unlock_bh(&sta->lock);
696	mpl_dbg("Mesh plink with %s ESTABLISHED\n",	696	mpl_dbg("Mesh plink with %s ESTABLISHED\n",
697	print_mac(mac, sta->addr));	697	print_mac(mac, sta->sta.addr));
698	mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->addr, llid,	698	mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->sta.addr, llid,
699	plid, 0);	699	plid, 0);
700	break;	700	break;
701	default:	701	default:
@@ -714,13 +714,13 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
714	llid = sta->llid;	714	llid = sta->llid;
715	mod_plink_timer(sta, dot11MeshHoldingTimeout(sdata));	715	mod_plink_timer(sta, dot11MeshHoldingTimeout(sdata));
716	spin_unlock_bh(&sta->lock);	716	spin_unlock_bh(&sta->lock);
717	mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->addr, llid,	717	mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->sta.addr, llid,
718	plid, reason);	718	plid, reason);
719	break;	719	break;
720	case OPN_ACPT:	720	case OPN_ACPT:
721	llid = sta->llid;	721	llid = sta->llid;
722	spin_unlock_bh(&sta->lock);	722	spin_unlock_bh(&sta->lock);
723	mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->addr, llid,	723	mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->sta.addr, llid,
724	plid, 0);	724	plid, 0);
725	break;	725	break;
726	default:	726	default:
@@ -743,8 +743,8 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
743	llid = sta->llid;	743	llid = sta->llid;
744	reason = sta->reason;	744	reason = sta->reason;
745	spin_unlock_bh(&sta->lock);	745	spin_unlock_bh(&sta->lock);
746	mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->addr, llid,	746	mesh_plink_frame_tx(sdata, PLINK_CLOSE, sta->sta.addr,
747	plid, reason);	747	llid, plid, reason);
748	break;	748	break;
749	default:	749	default:
750	spin_unlock_bh(&sta->lock);	750	spin_unlock_bh(&sta->lock);