~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,23 +1,6 @@
	1	+// SPDX-License-Identifier: GPL-2.0-or-later
1	2	/*
2	3	* Copyright(c) 1999 - 2004 Intel Corporation. All rights reserved.
3		- *
4		- * This program is free software; you can redistribute it and/or modify it
5		- * under the terms of the GNU General Public License as published by the Free
6		- * Software Foundation; either version 2 of the License, or (at your option)
7		- * any later version.
8		- *
9		- * This program is distributed in the hope that it will be useful, but WITHOUT
10		- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11		- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
12		- * more details.
13		- *
14		- * You should have received a copy of the GNU General Public License along with
15		- * this program; if not, write to the Free Software Foundation, Inc., 59
16		- * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17		- *
18		- * The full GNU General Public License is included in this distribution in the
19		- * file called LICENSE.
20		- *
21	4	*/
22	5
23	6	#include <linux/skbuff.h>
..	..	@@ -31,6 +14,7 @@
31	14	#include <net/net_namespace.h>
32	15	#include <net/bonding.h>
33	16	#include <net/bond_3ad.h>
	17	+#include <net/netlink.h>
34	18
35	19	/* General definitions */
36	20	#define AD_SHORT_TIMEOUT 1
..	..	@@ -46,16 +30,6 @@
46	30	#define AD_LONG_TIMEOUT_TIME (3*AD_SLOW_PERIODIC_TIME)
47	31	#define AD_CHURN_DETECTION_TIME 60
48	32	#define AD_AGGREGATE_WAIT_TIME 2
49		-
50		-/* Port state definitions (43.4.2.2 in the 802.3ad standard) */
51		-#define AD_STATE_LACP_ACTIVITY 0x1
52		-#define AD_STATE_LACP_TIMEOUT 0x2
53		-#define AD_STATE_AGGREGATION 0x4
54		-#define AD_STATE_SYNCHRONIZATION 0x8
55		-#define AD_STATE_COLLECTING 0x10
56		-#define AD_STATE_DISTRIBUTING 0x20
57		-#define AD_STATE_DEFAULTED 0x40
58		-#define AD_STATE_EXPIRED 0x80
59	33
60	34	/* Port Variables definitions used by the State Machines (43.4.7 in the
61	35	* 802.3ad standard)
..	..	@@ -111,8 +85,9 @@
111	85	static u16 ad_ticks_per_sec;
112	86	static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL * HZ) / 1000;
113	87
114		-static const u8 lacpdu_mcast_addr[ETH_ALEN + 2] __long_aligned =
115		- MULTICAST_LACPDU_ADDR;
	88	+const u8 lacpdu_mcast_addr[ETH_ALEN + 2] __long_aligned = {
	89	+ 0x01, 0x80, 0xC2, 0x00, 0x00, 0x02
	90	+};
116	91
117	92	/* ================= main 802.3ad protocol functions ================== */
118	93	static int ad_lacpdu_send(struct port *port);
..	..	@@ -156,7 +131,7 @@
156	131
157	132	/**
158	133	* __get_first_agg - get the first aggregator in the bond
159		- * @bond: the bond we're looking at
	134	+ * @port: the port we're looking at
160	135	*
161	136	* Return the aggregator of the first slave in @bond, or %NULL if it can't be
162	137	* found.
..	..	@@ -341,17 +316,17 @@
341	316	default:
342	317	/* unknown speed value from ethtool. shouldn't happen */
343	318	if (slave->speed != SPEED_UNKNOWN)
344		- pr_warn_once("%s: unknown ethtool speed (%d) for port %d (set it to 0)\n",
	319	+ pr_warn_once("%s: (slave %s): unknown ethtool speed (%d) for port %d (set it to 0)\n",
345	320	slave->bond->dev->name,
346		- slave->speed,
	321	+ slave->dev->name, slave->speed,
347	322	port->actor_port_number);
348	323	speed = 0;
349	324	break;
350	325	}
351	326	}
352	327
353		- netdev_dbg(slave->bond->dev, "Port %d Received link speed %d update from adapter\n",
354		- port->actor_port_number, speed);
	328	+ slave_dbg(slave->bond->dev, slave->dev, "Port %d Received link speed %d update from adapter\n",
	329	+ port->actor_port_number, speed);
355	330	return speed;
356	331	}
357	332
..	..	@@ -375,14 +350,14 @@
375	350	switch (slave->duplex) {
376	351	case DUPLEX_FULL:
377	352	retval = 0x1;
378		- netdev_dbg(slave->bond->dev, "Port %d Received status full duplex update from adapter\n",
379		- port->actor_port_number);
	353	+ slave_dbg(slave->bond->dev, slave->dev, "Port %d Received status full duplex update from adapter\n",
	354	+ port->actor_port_number);
380	355	break;
381	356	case DUPLEX_HALF:
382	357	default:
383	358	retval = 0x0;
384		- netdev_dbg(slave->bond->dev, "Port %d Received status NOT full duplex update from adapter\n",
385		- port->actor_port_number);
	359	+ slave_dbg(slave->bond->dev, slave->dev, "Port %d Received status NOT full duplex update from adapter\n",
	360	+ port->actor_port_number);
386	361	break;
387	362	}
388	363	}
..	..	@@ -473,8 +448,8 @@
473	448	MAC_ADDRESS_EQUAL(&(lacpdu->partner_system), &(port->actor_system)) &&
474	449	(ntohs(lacpdu->partner_system_priority) == port->actor_system_priority) &&
475	450	(ntohs(lacpdu->partner_key) == port->actor_oper_port_key) &&
476		- ((lacpdu->partner_state & AD_STATE_AGGREGATION) == (port->actor_oper_port_state & AD_STATE_AGGREGATION))) \|\|
477		- ((lacpdu->actor_state & AD_STATE_AGGREGATION) == 0)
	451	+ ((lacpdu->partner_state & LACP_STATE_AGGREGATION) == (port->actor_oper_port_state & LACP_STATE_AGGREGATION))) \|\|
	452	+ ((lacpdu->actor_state & LACP_STATE_AGGREGATION) == 0)
478	453	) {
479	454	port->sm_vars \|= AD_PORT_MATCHED;
480	455	} else {
..	..	@@ -508,18 +483,20 @@
508	483	partner->port_state = lacpdu->actor_state;
509	484
510	485	/* set actor_oper_port_state.defaulted to FALSE */
511		- port->actor_oper_port_state &= ~AD_STATE_DEFAULTED;
	486	+ port->actor_oper_port_state &= ~LACP_STATE_DEFAULTED;
512	487
513	488	/* set the partner sync. to on if the partner is sync,
514	489	* and the port is matched
515	490	*/
516	491	if ((port->sm_vars & AD_PORT_MATCHED) &&
517		- (lacpdu->actor_state & AD_STATE_SYNCHRONIZATION)) {
518		- partner->port_state \|= AD_STATE_SYNCHRONIZATION;
519		- pr_debug("%s partner sync=1\n", port->slave->dev->name);
	492	+ (lacpdu->actor_state & LACP_STATE_SYNCHRONIZATION)) {
	493	+ partner->port_state \|= LACP_STATE_SYNCHRONIZATION;
	494	+ slave_dbg(port->slave->bond->dev, port->slave->dev,
	495	+ "partner sync=1\n");
520	496	} else {
521		- partner->port_state &= ~AD_STATE_SYNCHRONIZATION;
522		- pr_debug("%s partner sync=0\n", port->slave->dev->name);
	497	+ partner->port_state &= ~LACP_STATE_SYNCHRONIZATION;
	498	+ slave_dbg(port->slave->bond->dev, port->slave->dev,
	499	+ "partner sync=0\n");
523	500	}
524	501	}
525	502	}
..	..	@@ -540,7 +517,7 @@
540	517	sizeof(struct port_params));
541	518
542	519	/* set actor_oper_port_state.defaulted to true */
543		- port->actor_oper_port_state \|= AD_STATE_DEFAULTED;
	520	+ port->actor_oper_port_state \|= LACP_STATE_DEFAULTED;
544	521	}
545	522	}
546	523
..	..	@@ -570,7 +547,7 @@
570	547	!MAC_ADDRESS_EQUAL(&lacpdu->actor_system, &partner->system) \|\|
571	548	ntohs(lacpdu->actor_system_priority) != partner->system_priority \|\|
572	549	ntohs(lacpdu->actor_key) != partner->key \|\|
573		- (lacpdu->actor_state & AD_STATE_AGGREGATION) != (partner->port_state & AD_STATE_AGGREGATION)) {
	550	+ (lacpdu->actor_state & LACP_STATE_AGGREGATION) != (partner->port_state & LACP_STATE_AGGREGATION)) {
574	551	port->sm_vars &= ~AD_PORT_SELECTED;
575	552	}
576	553	}
..	..	@@ -602,8 +579,8 @@
602	579	!MAC_ADDRESS_EQUAL(&admin->system, &oper->system) \|\|
603	580	admin->system_priority != oper->system_priority \|\|
604	581	admin->key != oper->key \|\|
605		- (admin->port_state & AD_STATE_AGGREGATION)
606		- != (oper->port_state & AD_STATE_AGGREGATION)) {
	582	+ (admin->port_state & LACP_STATE_AGGREGATION)
	583	+ != (oper->port_state & LACP_STATE_AGGREGATION)) {
607	584	port->sm_vars &= ~AD_PORT_SELECTED;
608	585	}
609	586	}
..	..	@@ -633,10 +610,10 @@
633	610	!MAC_ADDRESS_EQUAL(&(lacpdu->partner_system), &(port->actor_system)) \|\|
634	611	(ntohs(lacpdu->partner_system_priority) != port->actor_system_priority) \|\|
635	612	(ntohs(lacpdu->partner_key) != port->actor_oper_port_key) \|\|
636		- ((lacpdu->partner_state & AD_STATE_LACP_ACTIVITY) != (port->actor_oper_port_state & AD_STATE_LACP_ACTIVITY)) \|\|
637		- ((lacpdu->partner_state & AD_STATE_LACP_TIMEOUT) != (port->actor_oper_port_state & AD_STATE_LACP_TIMEOUT)) \|\|
638		- ((lacpdu->partner_state & AD_STATE_SYNCHRONIZATION) != (port->actor_oper_port_state & AD_STATE_SYNCHRONIZATION)) \|\|
639		- ((lacpdu->partner_state & AD_STATE_AGGREGATION) != (port->actor_oper_port_state & AD_STATE_AGGREGATION))
	613	+ ((lacpdu->partner_state & LACP_STATE_LACP_ACTIVITY) != (port->actor_oper_port_state & LACP_STATE_LACP_ACTIVITY)) \|\|
	614	+ ((lacpdu->partner_state & LACP_STATE_LACP_TIMEOUT) != (port->actor_oper_port_state & LACP_STATE_LACP_TIMEOUT)) \|\|
	615	+ ((lacpdu->partner_state & LACP_STATE_SYNCHRONIZATION) != (port->actor_oper_port_state & LACP_STATE_SYNCHRONIZATION)) \|\|
	616	+ ((lacpdu->partner_state & LACP_STATE_AGGREGATION) != (port->actor_oper_port_state & LACP_STATE_AGGREGATION))
640	617	) {
641	618	port->ntt = true;
642	619	}
..	..	@@ -805,8 +782,9 @@
805	782	lacpdu->actor_port_priority = htons(port->actor_port_priority);
806	783	lacpdu->actor_port = htons(port->actor_port_number);
807	784	lacpdu->actor_state = port->actor_oper_port_state;
808		- pr_debug("update lacpdu: %s, actor port state %x\n",
809		- port->slave->dev->name, port->actor_oper_port_state);
	785	+ slave_dbg(port->slave->bond->dev, port->slave->dev,
	786	+ "update lacpdu: actor port state %x\n",
	787	+ port->actor_oper_port_state);
810	788
811	789	/* lacpdu->reserved_3_1 initialized
812	790	* lacpdu->tlv_type_partner_info initialized
..	..	@@ -851,6 +829,9 @@
851	829	if (!skb)
852	830	return -ENOMEM;
853	831
	832	+ atomic64_inc(&SLAVE_AD_INFO(slave)->stats.lacpdu_tx);
	833	+ atomic64_inc(&BOND_AD_INFO(slave->bond).stats.lacpdu_tx);
	834	+
854	835	skb->dev = slave->dev;
855	836	skb_reset_mac_header(skb);
856	837	skb->network_header = skb->mac_header + ETH_HLEN;
..	..	@@ -891,6 +872,17 @@
891	872	skb = dev_alloc_skb(length + 16);
892	873	if (!skb)
893	874	return -ENOMEM;
	875	+
	876	+ switch (marker->tlv_type) {
	877	+ case AD_MARKER_INFORMATION_SUBTYPE:
	878	+ atomic64_inc(&SLAVE_AD_INFO(slave)->stats.marker_tx);
	879	+ atomic64_inc(&BOND_AD_INFO(slave->bond).stats.marker_tx);
	880	+ break;
	881	+ case AD_MARKER_RESPONSE_SUBTYPE:
	882	+ atomic64_inc(&SLAVE_AD_INFO(slave)->stats.marker_resp_tx);
	883	+ atomic64_inc(&BOND_AD_INFO(slave->bond).stats.marker_resp_tx);
	884	+ break;
	885	+ }
894	886
895	887	skb_reserve(skb, 16);
896	888
..	..	@@ -977,7 +969,7 @@
977	969	* edable port will take place only after this timer)
978	970	*/
979	971	if ((port->sm_vars & AD_PORT_SELECTED) &&
980		- (port->partner_oper.port_state & AD_STATE_SYNCHRONIZATION) &&
	972	+ (port->partner_oper.port_state & LACP_STATE_SYNCHRONIZATION) &&
981	973	!__check_agg_selection_timer(port)) {
982	974	if (port->aggregator->is_active)
983	975	port->sm_mux_state =
..	..	@@ -995,14 +987,14 @@
995	987	port->sm_mux_state = AD_MUX_DETACHED;
996	988	} else if (port->aggregator->is_active) {
997	989	port->actor_oper_port_state \|=
998		- AD_STATE_SYNCHRONIZATION;
	990	+ LACP_STATE_SYNCHRONIZATION;
999	991	}
1000	992	break;
1001	993	case AD_MUX_COLLECTING_DISTRIBUTING:
1002	994	if (!(port->sm_vars & AD_PORT_SELECTED) \|\|
1003	995	(port->sm_vars & AD_PORT_STANDBY) \|\|
1004		- !(port->partner_oper.port_state & AD_STATE_SYNCHRONIZATION) \|\|
1005		- !(port->actor_oper_port_state & AD_STATE_SYNCHRONIZATION)) {
	996	+ !(port->partner_oper.port_state & LACP_STATE_SYNCHRONIZATION) \|\|
	997	+ !(port->actor_oper_port_state & LACP_STATE_SYNCHRONIZATION)) {
1006	998	port->sm_mux_state = AD_MUX_ATTACHED;
1007	999	} else {
1008	1000	/* if port state hasn't changed make
..	..	@@ -1024,18 +1016,18 @@
1024	1016
1025	1017	/* check if the state machine was changed */
1026	1018	if (port->sm_mux_state != last_state) {
1027		- pr_debug("Mux Machine: Port=%d (%s), Last State=%d, Curr State=%d\n",
1028		- port->actor_port_number,
1029		- port->slave->dev->name,
1030		- last_state,
1031		- port->sm_mux_state);
	1019	+ slave_dbg(port->slave->bond->dev, port->slave->dev,
	1020	+ "Mux Machine: Port=%d, Last State=%d, Curr State=%d\n",
	1021	+ port->actor_port_number,
	1022	+ last_state,
	1023	+ port->sm_mux_state);
1032	1024	switch (port->sm_mux_state) {
1033	1025	case AD_MUX_DETACHED:
1034		- port->actor_oper_port_state &= ~AD_STATE_SYNCHRONIZATION;
	1026	+ port->actor_oper_port_state &= ~LACP_STATE_SYNCHRONIZATION;
1035	1027	ad_disable_collecting_distributing(port,
1036	1028	update_slave_arr);
1037		- port->actor_oper_port_state &= ~AD_STATE_COLLECTING;
1038		- port->actor_oper_port_state &= ~AD_STATE_DISTRIBUTING;
	1029	+ port->actor_oper_port_state &= ~LACP_STATE_COLLECTING;
	1030	+ port->actor_oper_port_state &= ~LACP_STATE_DISTRIBUTING;
1039	1031	port->ntt = true;
1040	1032	break;
1041	1033	case AD_MUX_WAITING:
..	..	@@ -1044,20 +1036,20 @@
1044	1036	case AD_MUX_ATTACHED:
1045	1037	if (port->aggregator->is_active)
1046	1038	port->actor_oper_port_state \|=
1047		- AD_STATE_SYNCHRONIZATION;
	1039	+ LACP_STATE_SYNCHRONIZATION;
1048	1040	else
1049	1041	port->actor_oper_port_state &=
1050		- ~AD_STATE_SYNCHRONIZATION;
1051		- port->actor_oper_port_state &= ~AD_STATE_COLLECTING;
1052		- port->actor_oper_port_state &= ~AD_STATE_DISTRIBUTING;
	1042	+ ~LACP_STATE_SYNCHRONIZATION;
	1043	+ port->actor_oper_port_state &= ~LACP_STATE_COLLECTING;
	1044	+ port->actor_oper_port_state &= ~LACP_STATE_DISTRIBUTING;
1053	1045	ad_disable_collecting_distributing(port,
1054	1046	update_slave_arr);
1055	1047	port->ntt = true;
1056	1048	break;
1057	1049	case AD_MUX_COLLECTING_DISTRIBUTING:
1058		- port->actor_oper_port_state \|= AD_STATE_COLLECTING;
1059		- port->actor_oper_port_state \|= AD_STATE_DISTRIBUTING;
1060		- port->actor_oper_port_state \|= AD_STATE_SYNCHRONIZATION;
	1050	+ port->actor_oper_port_state \|= LACP_STATE_COLLECTING;
	1051	+ port->actor_oper_port_state \|= LACP_STATE_DISTRIBUTING;
	1052	+ port->actor_oper_port_state \|= LACP_STATE_SYNCHRONIZATION;
1061	1053	ad_enable_collecting_distributing(port,
1062	1054	update_slave_arr);
1063	1055	port->ntt = true;
..	..	@@ -1086,6 +1078,10 @@
1086	1078	*/
1087	1079	last_state = port->sm_rx_state;
1088	1080
	1081	+ if (lacpdu) {
	1082	+ atomic64_inc(&SLAVE_AD_INFO(port->slave)->stats.lacpdu_rx);
	1083	+ atomic64_inc(&BOND_AD_INFO(port->slave->bond).stats.lacpdu_rx);
	1084	+ }
1089	1085	/* check if state machine should change state */
1090	1086
1091	1087	/* first, check if port was reinitialized */
..	..	@@ -1138,11 +1134,11 @@
1138	1134
1139	1135	/* check if the State machine was changed or new lacpdu arrived */
1140	1136	if ((port->sm_rx_state != last_state) \|\| (lacpdu)) {
1141		- pr_debug("Rx Machine: Port=%d (%s), Last State=%d, Curr State=%d\n",
1142		- port->actor_port_number,
1143		- port->slave->dev->name,
1144		- last_state,
1145		- port->sm_rx_state);
	1137	+ slave_dbg(port->slave->bond->dev, port->slave->dev,
	1138	+ "Rx Machine: Port=%d, Last State=%d, Curr State=%d\n",
	1139	+ port->actor_port_number,
	1140	+ last_state,
	1141	+ port->sm_rx_state);
1146	1142	switch (port->sm_rx_state) {
1147	1143	case AD_RX_INITIALIZE:
1148	1144	if (!(port->actor_oper_port_key & AD_DUPLEX_KEY_MASKS))
..	..	@@ -1151,19 +1147,19 @@
1151	1147	port->sm_vars \|= AD_PORT_LACP_ENABLED;
1152	1148	port->sm_vars &= ~AD_PORT_SELECTED;
1153	1149	__record_default(port);
1154		- port->actor_oper_port_state &= ~AD_STATE_EXPIRED;
	1150	+ port->actor_oper_port_state &= ~LACP_STATE_EXPIRED;
1155	1151	port->sm_rx_state = AD_RX_PORT_DISABLED;
1156	1152
1157		- /* Fall Through */
	1153	+ fallthrough;
1158	1154	case AD_RX_PORT_DISABLED:
1159	1155	port->sm_vars &= ~AD_PORT_MATCHED;
1160	1156	break;
1161	1157	case AD_RX_LACP_DISABLED:
1162	1158	port->sm_vars &= ~AD_PORT_SELECTED;
1163	1159	__record_default(port);
1164		- port->partner_oper.port_state &= ~AD_STATE_AGGREGATION;
	1160	+ port->partner_oper.port_state &= ~LACP_STATE_AGGREGATION;
1165	1161	port->sm_vars \|= AD_PORT_MATCHED;
1166		- port->actor_oper_port_state &= ~AD_STATE_EXPIRED;
	1162	+ port->actor_oper_port_state &= ~LACP_STATE_EXPIRED;
1167	1163	break;
1168	1164	case AD_RX_EXPIRED:
1169	1165	/* Reset of the Synchronization flag (Standard 43.4.12)
..	..	@@ -1172,34 +1168,33 @@
1172	1168	* case of EXPIRED even if LINK_DOWN didn't arrive for
1173	1169	* the port.
1174	1170	*/
1175		- port->partner_oper.port_state &= ~AD_STATE_SYNCHRONIZATION;
	1171	+ port->partner_oper.port_state &= ~LACP_STATE_SYNCHRONIZATION;
1176	1172	port->sm_vars &= ~AD_PORT_MATCHED;
1177		- port->partner_oper.port_state \|= AD_STATE_LACP_TIMEOUT;
1178		- port->partner_oper.port_state \|= AD_STATE_LACP_ACTIVITY;
	1173	+ port->partner_oper.port_state \|= LACP_STATE_LACP_TIMEOUT;
	1174	+ port->partner_oper.port_state \|= LACP_STATE_LACP_ACTIVITY;
1179	1175	port->sm_rx_timer_counter = __ad_timer_to_ticks(AD_CURRENT_WHILE_TIMER, (u16)(AD_SHORT_TIMEOUT));
1180		- port->actor_oper_port_state \|= AD_STATE_EXPIRED;
	1176	+ port->actor_oper_port_state \|= LACP_STATE_EXPIRED;
1181	1177	port->sm_vars \|= AD_PORT_CHURNED;
1182	1178	break;
1183	1179	case AD_RX_DEFAULTED:
1184	1180	__update_default_selected(port);
1185	1181	__record_default(port);
1186	1182	port->sm_vars \|= AD_PORT_MATCHED;
1187		- port->actor_oper_port_state &= ~AD_STATE_EXPIRED;
	1183	+ port->actor_oper_port_state &= ~LACP_STATE_EXPIRED;
1188	1184	break;
1189	1185	case AD_RX_CURRENT:
1190	1186	/* detect loopback situation */
1191	1187	if (MAC_ADDRESS_EQUAL(&(lacpdu->actor_system),
1192	1188	&(port->actor_system))) {
1193		- netdev_err(port->slave->bond->dev, "An illegal loopback occurred on adapter (%s)\n"
1194		- "Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n",
1195		- port->slave->dev->name);
	1189	+ slave_err(port->slave->bond->dev, port->slave->dev, "An illegal loopback occurred on slave\n"
	1190	+ "Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n");
1196	1191	return;
1197	1192	}
1198	1193	__update_selected(lacpdu, port);
1199	1194	__update_ntt(lacpdu, port);
1200	1195	__record_pdu(lacpdu, port);
1201		- port->sm_rx_timer_counter = __ad_timer_to_ticks(AD_CURRENT_WHILE_TIMER, (u16)(port->actor_oper_port_state & AD_STATE_LACP_TIMEOUT));
1202		- port->actor_oper_port_state &= ~AD_STATE_EXPIRED;
	1196	+ port->sm_rx_timer_counter = __ad_timer_to_ticks(AD_CURRENT_WHILE_TIMER, (u16)(port->actor_oper_port_state & LACP_STATE_LACP_TIMEOUT));
	1197	+ port->actor_oper_port_state &= ~LACP_STATE_EXPIRED;
1203	1198	break;
1204	1199	default:
1205	1200	break;
..	..	@@ -1220,14 +1215,14 @@
1220	1215	port->sm_churn_partner_state = AD_CHURN_MONITOR;
1221	1216	port->sm_churn_actor_timer_counter =
1222	1217	__ad_timer_to_ticks(AD_ACTOR_CHURN_TIMER, 0);
1223		- port->sm_churn_partner_timer_counter =
	1218	+ port->sm_churn_partner_timer_counter =
1224	1219	__ad_timer_to_ticks(AD_PARTNER_CHURN_TIMER, 0);
1225	1220	return;
1226	1221	}
1227	1222	if (port->sm_churn_actor_timer_counter &&
1228	1223	!(--port->sm_churn_actor_timer_counter) &&
1229	1224	port->sm_churn_actor_state == AD_CHURN_MONITOR) {
1230		- if (port->actor_oper_port_state & AD_STATE_SYNCHRONIZATION) {
	1225	+ if (port->actor_oper_port_state & LACP_STATE_SYNCHRONIZATION) {
1231	1226	port->sm_churn_actor_state = AD_NO_CHURN;
1232	1227	} else {
1233	1228	port->churn_actor_count++;
..	..	@@ -1237,7 +1232,7 @@
1237	1232	if (port->sm_churn_partner_timer_counter &&
1238	1233	!(--port->sm_churn_partner_timer_counter) &&
1239	1234	port->sm_churn_partner_state == AD_CHURN_MONITOR) {
1240		- if (port->partner_oper.port_state & AD_STATE_SYNCHRONIZATION) {
	1235	+ if (port->partner_oper.port_state & LACP_STATE_SYNCHRONIZATION) {
1241	1236	port->sm_churn_partner_state = AD_NO_CHURN;
1242	1237	} else {
1243	1238	port->churn_partner_count++;
..	..	@@ -1261,8 +1256,10 @@
1261	1256	__update_lacpdu_from_port(port);
1262	1257
1263	1258	if (ad_lacpdu_send(port) >= 0) {
1264		- pr_debug("Sent LACPDU on port %d\n",
1265		- port->actor_port_number);
	1259	+ slave_dbg(port->slave->bond->dev,
	1260	+ port->slave->dev,
	1261	+ "Sent LACPDU on port %d\n",
	1262	+ port->actor_port_number);
1266	1263
1267	1264	/* mark ntt as false, so it will not be sent
1268	1265	* again until demanded
..	..	@@ -1292,7 +1289,7 @@
1292	1289
1293	1290	/* check if port was reinitialized */
1294	1291	if (((port->sm_vars & AD_PORT_BEGIN) \|\| !(port->sm_vars & AD_PORT_LACP_ENABLED) \|\| !port->is_enabled) \|\|
1295		- (!(port->actor_oper_port_state & AD_STATE_LACP_ACTIVITY) && !(port->partner_oper.port_state & AD_STATE_LACP_ACTIVITY))
	1292	+ (!(port->actor_oper_port_state & LACP_STATE_LACP_ACTIVITY) && !(port->partner_oper.port_state & LACP_STATE_LACP_ACTIVITY))
1296	1293	) {
1297	1294	port->sm_periodic_state = AD_NO_PERIODIC;
1298	1295	}
..	..	@@ -1309,11 +1306,11 @@
1309	1306	switch (port->sm_periodic_state) {
1310	1307	case AD_FAST_PERIODIC:
1311	1308	if (!(port->partner_oper.port_state
1312		- & AD_STATE_LACP_TIMEOUT))
	1309	+ & LACP_STATE_LACP_TIMEOUT))
1313	1310	port->sm_periodic_state = AD_SLOW_PERIODIC;
1314	1311	break;
1315	1312	case AD_SLOW_PERIODIC:
1316		- if ((port->partner_oper.port_state & AD_STATE_LACP_TIMEOUT)) {
	1313	+ if ((port->partner_oper.port_state & LACP_STATE_LACP_TIMEOUT)) {
1317	1314	port->sm_periodic_timer_counter = 0;
1318	1315	port->sm_periodic_state = AD_PERIODIC_TX;
1319	1316	}
..	..	@@ -1329,7 +1326,7 @@
1329	1326	break;
1330	1327	case AD_PERIODIC_TX:
1331	1328	if (!(port->partner_oper.port_state &
1332		- AD_STATE_LACP_TIMEOUT))
	1329	+ LACP_STATE_LACP_TIMEOUT))
1333	1330	port->sm_periodic_state = AD_SLOW_PERIODIC;
1334	1331	else
1335	1332	port->sm_periodic_state = AD_FAST_PERIODIC;
..	..	@@ -1341,9 +1338,10 @@
1341	1338
1342	1339	/* check if the state machine was changed */
1343	1340	if (port->sm_periodic_state != last_state) {
1344		- pr_debug("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n",
1345		- port->actor_port_number, last_state,
1346		- port->sm_periodic_state);
	1341	+ slave_dbg(port->slave->bond->dev, port->slave->dev,
	1342	+ "Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n",
	1343	+ port->actor_port_number, last_state,
	1344	+ port->sm_periodic_state);
1347	1345	switch (port->sm_periodic_state) {
1348	1346	case AD_NO_PERIODIC:
1349	1347	port->sm_periodic_timer_counter = 0;
..	..	@@ -1419,9 +1417,9 @@
1419	1417	port->next_port_in_aggregator = NULL;
1420	1418	port->actor_port_aggregator_identifier = 0;
1421	1419
1422		- netdev_dbg(bond->dev, "Port %d left LAG %d\n",
1423		- port->actor_port_number,
1424		- temp_aggregator->aggregator_identifier);
	1420	+ slave_dbg(bond->dev, port->slave->dev, "Port %d left LAG %d\n",
	1421	+ port->actor_port_number,
	1422	+ temp_aggregator->aggregator_identifier);
1425	1423	/* if the aggregator is empty, clear its
1426	1424	* parameters, and set it ready to be attached
1427	1425	*/
..	..	@@ -1434,10 +1432,10 @@
1434	1432	/* meaning: the port was related to an aggregator
1435	1433	* but was not on the aggregator port list
1436	1434	*/
1437		- net_warn_ratelimited("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",
	1435	+ net_warn_ratelimited("%s: (slave %s): Warning: Port %d was related to aggregator %d but was not on its port list\n",
1438	1436	port->slave->bond->dev->name,
1439		- port->actor_port_number,
1440	1437	port->slave->dev->name,
	1438	+ port->actor_port_number,
1441	1439	port->aggregator->aggregator_identifier);
1442	1440	}
1443	1441	}
..	..	@@ -1468,9 +1466,9 @@
1468	1466	port->next_port_in_aggregator = aggregator->lag_ports;
1469	1467	port->aggregator->num_of_ports++;
1470	1468	aggregator->lag_ports = port;
1471		- netdev_dbg(bond->dev, "Port %d joined LAG %d(existing LAG)\n",
1472		- port->actor_port_number,
1473		- port->aggregator->aggregator_identifier);
	1469	+ slave_dbg(bond->dev, slave->dev, "Port %d joined LAG %d (existing LAG)\n",
	1470	+ port->actor_port_number,
	1471	+ port->aggregator->aggregator_identifier);
1474	1472
1475	1473	/* mark this port as selected */
1476	1474	port->sm_vars \|= AD_PORT_SELECTED;
..	..	@@ -1515,12 +1513,14 @@
1515	1513	/* mark this port as selected */
1516	1514	port->sm_vars \|= AD_PORT_SELECTED;
1517	1515
1518		- netdev_dbg(bond->dev, "Port %d joined LAG %d(new LAG)\n",
1519		- port->actor_port_number,
1520		- port->aggregator->aggregator_identifier);
	1516	+ slave_dbg(bond->dev, port->slave->dev, "Port %d joined LAG %d (new LAG)\n",
	1517	+ port->actor_port_number,
	1518	+ port->aggregator->aggregator_identifier);
1521	1519	} else {
1522		- netdev_err(bond->dev, "Port %d (on %s) did not find a suitable aggregator\n",
1523		- port->actor_port_number, port->slave->dev->name);
	1520	+ slave_err(bond->dev, port->slave->dev,
	1521	+ "Port %d did not find a suitable aggregator\n",
	1522	+ port->actor_port_number);
	1523	+ return;
1524	1524	}
1525	1525	}
1526	1526	/* if all aggregator's ports are READY_N == TRUE, set ready=TRUE
..	..	@@ -1534,7 +1534,7 @@
1534	1534	ad_agg_selection_logic(aggregator, update_slave_arr);
1535	1535
1536	1536	if (!port->aggregator->is_active)
1537		- port->actor_oper_port_state &= ~AD_STATE_SYNCHRONIZATION;
	1537	+ port->actor_oper_port_state &= ~LACP_STATE_SYNCHRONIZATION;
1538	1538	}
1539	1539
1540	1540	/* Decide if "agg" is a better choice for the new active aggregator that
..	..	@@ -1590,7 +1590,7 @@
1590	1590	if (__agg_active_ports(curr) < __agg_active_ports(best))
1591	1591	return best;
1592	1592
1593		- /FALLTHROUGH/
	1593	+ fallthrough;
1594	1594	case BOND_AD_STABLE:
1595	1595	case BOND_AD_BANDWIDTH:
1596	1596	if (__get_agg_bandwidth(curr) > __get_agg_bandwidth(best))
..	..	@@ -1599,8 +1599,9 @@
1599	1599	break;
1600	1600
1601	1601	default:
1602		- net_warn_ratelimited("%s: Impossible agg select mode %d\n",
	1602	+ net_warn_ratelimited("%s: (slave %s): Impossible agg select mode %d\n",
1603	1603	curr->slave->bond->dev->name,
	1604	+ curr->slave->dev->name,
1604	1605	__get_agg_selection_mode(curr->lag_ports));
1605	1606	break;
1606	1607	}
..	..	@@ -1627,7 +1628,7 @@
1627	1628
1628	1629	/**
1629	1630	* ad_agg_selection_logic - select an aggregation group for a team
1630		- * @aggregator: the aggregator we're looking at
	1631	+ * @agg: the aggregator we're looking at
1631	1632	* @update_slave_arr: Does slave array need update?
1632	1633	*
1633	1634	* It is assumed that only one aggregator may be selected for a team.
..	..	@@ -1701,36 +1702,37 @@
1701	1702
1702	1703	/* if there is new best aggregator, activate it */
1703	1704	if (best) {
1704		- netdev_dbg(bond->dev, "best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
	1705	+ netdev_dbg(bond->dev, "(slave %s): best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
	1706	+ best->slave ? best->slave->dev->name : "NULL",
1705	1707	best->aggregator_identifier, best->num_of_ports,
1706	1708	best->actor_oper_aggregator_key,
1707	1709	best->partner_oper_aggregator_key,
1708	1710	best->is_individual, best->is_active);
1709		- netdev_dbg(bond->dev, "best ports %p slave %p %s\n",
1710		- best->lag_ports, best->slave,
1711		- best->slave ? best->slave->dev->name : "NULL");
	1711	+ netdev_dbg(bond->dev, "(slave %s): best ports %p slave %p\n",
	1712	+ best->slave ? best->slave->dev->name : "NULL",
	1713	+ best->lag_ports, best->slave);
1712	1714
1713	1715	bond_for_each_slave_rcu(bond, slave, iter) {
1714	1716	agg = &(SLAVE_AD_INFO(slave)->aggregator);
1715	1717
1716		- netdev_dbg(bond->dev, "Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
1717		- agg->aggregator_identifier, agg->num_of_ports,
1718		- agg->actor_oper_aggregator_key,
1719		- agg->partner_oper_aggregator_key,
1720		- agg->is_individual, agg->is_active);
	1718	+ slave_dbg(bond->dev, slave->dev, "Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
	1719	+ agg->aggregator_identifier, agg->num_of_ports,
	1720	+ agg->actor_oper_aggregator_key,
	1721	+ agg->partner_oper_aggregator_key,
	1722	+ agg->is_individual, agg->is_active);
1721	1723	}
1722	1724
1723		- /* check if any partner replys */
1724		- if (best->is_individual) {
	1725	+ /* check if any partner replies */
	1726	+ if (best->is_individual)
1725	1727	net_warn_ratelimited("%s: Warning: No 802.3ad response from the link partner for any adapters in the bond\n",
1726		- best->slave ?
1727		- best->slave->bond->dev->name : "NULL");
1728		- }
	1728	+ bond->dev->name);
1729	1729
1730	1730	best->is_active = 1;
1731		- netdev_dbg(bond->dev, "LAG %d chosen as the active LAG\n",
	1731	+ netdev_dbg(bond->dev, "(slave %s): LAG %d chosen as the active LAG\n",
	1732	+ best->slave ? best->slave->dev->name : "NULL",
1732	1733	best->aggregator_identifier);
1733		- netdev_dbg(bond->dev, "Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
	1734	+ netdev_dbg(bond->dev, "(slave %s): Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
	1735	+ best->slave ? best->slave->dev->name : "NULL",
1734	1736	best->aggregator_identifier, best->num_of_ports,
1735	1737	best->actor_oper_aggregator_key,
1736	1738	best->partner_oper_aggregator_key,
..	..	@@ -1787,7 +1789,9 @@
1787	1789	aggregator->lag_ports = NULL;
1788	1790	aggregator->is_active = 0;
1789	1791	aggregator->num_of_ports = 0;
1790		- pr_debug("LAG %d was cleared\n",
	1792	+ pr_debug("%s: LAG %d was cleared\n",
	1793	+ aggregator->slave ?
	1794	+ aggregator->slave->dev->name : "NULL",
1791	1795	aggregator->aggregator_identifier);
1792	1796	}
1793	1797	}
..	..	@@ -1809,7 +1813,7 @@
1809	1813
1810	1814	/**
1811	1815	* ad_initialize_port - initialize a given port's parameters
1812		- * @aggregator: the aggregator we're looking at
	1816	+ * @port: the port we're looking at
1813	1817	* @lacp_fast: boolean. whether fast periodic should be used
1814	1818	*/
1815	1819	static void ad_initialize_port(struct port *port, int lacp_fast)
..	..	@@ -1837,13 +1841,13 @@
1837	1841	port->actor_port_priority = 0xff;
1838	1842	port->actor_port_aggregator_identifier = 0;
1839	1843	port->ntt = false;
1840		- port->actor_admin_port_state = AD_STATE_AGGREGATION \|
1841		- AD_STATE_LACP_ACTIVITY;
1842		- port->actor_oper_port_state = AD_STATE_AGGREGATION \|
1843		- AD_STATE_LACP_ACTIVITY;
	1844	+ port->actor_admin_port_state = LACP_STATE_AGGREGATION \|
	1845	+ LACP_STATE_LACP_ACTIVITY;
	1846	+ port->actor_oper_port_state = LACP_STATE_AGGREGATION \|
	1847	+ LACP_STATE_LACP_ACTIVITY;
1844	1848
1845	1849	if (lacp_fast)
1846		- port->actor_oper_port_state \|= AD_STATE_LACP_TIMEOUT;
	1850	+ port->actor_oper_port_state \|= LACP_STATE_LACP_TIMEOUT;
1847	1851
1848	1852	memcpy(&port->partner_admin, &tmpl, sizeof(tmpl));
1849	1853	memcpy(&port->partner_oper, &tmpl, sizeof(tmpl));
..	..	@@ -1884,9 +1888,10 @@
1884	1888	bool *update_slave_arr)
1885	1889	{
1886	1890	if (port->aggregator->is_active) {
1887		- pr_debug("Enabling port %d(LAG %d)\n",
1888		- port->actor_port_number,
1889		- port->aggregator->aggregator_identifier);
	1891	+ slave_dbg(port->slave->bond->dev, port->slave->dev,
	1892	+ "Enabling port %d (LAG %d)\n",
	1893	+ port->actor_port_number,
	1894	+ port->aggregator->aggregator_identifier);
1890	1895	__enable_port(port);
1891	1896	/* Slave array needs update */
1892	1897	*update_slave_arr = true;
..	..	@@ -1904,9 +1909,10 @@
1904	1909	if (port->aggregator &&
1905	1910	!MAC_ADDRESS_EQUAL(&(port->aggregator->partner_system),
1906	1911	&(null_mac_addr))) {
1907		- pr_debug("Disabling port %d(LAG %d)\n",
1908		- port->actor_port_number,
1909		- port->aggregator->aggregator_identifier);
	1912	+ slave_dbg(port->slave->bond->dev, port->slave->dev,
	1913	+ "Disabling port %d (LAG %d)\n",
	1914	+ port->actor_port_number,
	1915	+ port->aggregator->aggregator_identifier);
1910	1916	__disable_port(port);
1911	1917	/* Slave array needs an update */
1912	1918	*update_slave_arr = true;
..	..	@@ -1919,9 +1925,12 @@
1919	1925	* @port: the port we're looking at
1920	1926	*/
1921	1927	static void ad_marker_info_received(struct bond_marker *marker_info,
1922		- struct port *port)
	1928	+ struct port *port)
1923	1929	{
1924	1930	struct bond_marker marker;
	1931	+
	1932	+ atomic64_inc(&SLAVE_AD_INFO(port->slave)->stats.marker_rx);
	1933	+ atomic64_inc(&BOND_AD_INFO(port->slave->bond).stats.marker_rx);
1925	1934
1926	1935	/* copy the received marker data to the response marker */
1927	1936	memcpy(&marker, marker_info, sizeof(struct bond_marker));
..	..	@@ -1929,10 +1938,10 @@
1929	1938	marker.tlv_type = AD_MARKER_RESPONSE_SUBTYPE;
1930	1939
1931	1940	/* send the marker response */
1932		- if (ad_marker_send(port, &marker) >= 0) {
1933		- pr_debug("Sent Marker Response on port %d\n",
1934		- port->actor_port_number);
1935		- }
	1941	+ if (ad_marker_send(port, &marker) >= 0)
	1942	+ slave_dbg(port->slave->bond->dev, port->slave->dev,
	1943	+ "Sent Marker Response on port %d\n",
	1944	+ port->actor_port_number);
1936	1945	}
1937	1946
1938	1947	/**
..	..	@@ -1947,6 +1956,9 @@
1947	1956	static void ad_marker_response_received(struct bond_marker *marker,
1948	1957	struct port *port)
1949	1958	{
	1959	+ atomic64_inc(&SLAVE_AD_INFO(port->slave)->stats.marker_resp_rx);
	1960	+ atomic64_inc(&BOND_AD_INFO(port->slave->bond).stats.marker_resp_rx);
	1961	+
1950	1962	/* DO NOTHING, SINCE WE DECIDED NOT TO IMPLEMENT THIS FEATURE FOR NOW */
1951	1963	}
1952	1964
..	..	@@ -1958,6 +1970,7 @@
1958	1970	/**
1959	1971	* bond_3ad_initiate_agg_selection - initate aggregator selection
1960	1972	* @bond: bonding struct
	1973	+ * @timeout: timeout value to set
1961	1974	*
1962	1975	* Set the aggregation selection timer, to initiate an agg selection in
1963	1976	* the very near future. Called during first initialization, and during
..	..	@@ -1977,30 +1990,24 @@
1977	1990	*/
1978	1991	void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution)
1979	1992	{
1980		- /* check that the bond is not initialized yet */
1981		- if (!MAC_ADDRESS_EQUAL(&(BOND_AD_INFO(bond).system.sys_mac_addr),
1982		- bond->dev->dev_addr)) {
	1993	+ BOND_AD_INFO(bond).aggregator_identifier = 0;
	1994	+ BOND_AD_INFO(bond).system.sys_priority =
	1995	+ bond->params.ad_actor_sys_prio;
	1996	+ if (is_zero_ether_addr(bond->params.ad_actor_system))
	1997	+ BOND_AD_INFO(bond).system.sys_mac_addr =
	1998	+ ((struct mac_addr )bond->dev->dev_addr);
	1999	+ else
	2000	+ BOND_AD_INFO(bond).system.sys_mac_addr =
	2001	+ ((struct mac_addr )bond->params.ad_actor_system);
1983	2002
1984		- BOND_AD_INFO(bond).aggregator_identifier = 0;
	2003	+ /* initialize how many times this module is called in one
	2004	+ * second (should be about every 100ms)
	2005	+ */
	2006	+ ad_ticks_per_sec = tick_resolution;
1985	2007
1986		- BOND_AD_INFO(bond).system.sys_priority =
1987		- bond->params.ad_actor_sys_prio;
1988		- if (is_zero_ether_addr(bond->params.ad_actor_system))
1989		- BOND_AD_INFO(bond).system.sys_mac_addr =
1990		- ((struct mac_addr )bond->dev->dev_addr);
1991		- else
1992		- BOND_AD_INFO(bond).system.sys_mac_addr =
1993		- ((struct mac_addr )bond->params.ad_actor_system);
1994		-
1995		- /* initialize how many times this module is called in one
1996		- * second (should be about every 100ms)
1997		- */
1998		- ad_ticks_per_sec = tick_resolution;
1999		-
2000		- bond_3ad_initiate_agg_selection(bond,
2001		- AD_AGGREGATOR_SELECTION_TIMER *
2002		- ad_ticks_per_sec);
2003		- }
	2008	+ bond_3ad_initiate_agg_selection(bond,
	2009	+ AD_AGGREGATOR_SELECTION_TIMER *
	2010	+ ad_ticks_per_sec);
2004	2011	}
2005	2012
2006	2013	/**
..	..	@@ -2078,19 +2085,18 @@
2078	2085
2079	2086	/* if slave is null, the whole port is not initialized */
2080	2087	if (!port->slave) {
2081		- netdev_warn(bond->dev, "Trying to unbind an uninitialized port on %s\n",
2082		- slave->dev->name);
	2088	+ slave_warn(bond->dev, slave->dev, "Trying to unbind an uninitialized port\n");
2083	2089	goto out;
2084	2090	}
2085	2091
2086		- netdev_dbg(bond->dev, "Unbinding Link Aggregation Group %d\n",
2087		- aggregator->aggregator_identifier);
	2092	+ slave_dbg(bond->dev, slave->dev, "Unbinding Link Aggregation Group %d\n",
	2093	+ aggregator->aggregator_identifier);
2088	2094
2089	2095	/* Tell the partner that this port is not suitable for aggregation */
2090		- port->actor_oper_port_state &= ~AD_STATE_SYNCHRONIZATION;
2091		- port->actor_oper_port_state &= ~AD_STATE_COLLECTING;
2092		- port->actor_oper_port_state &= ~AD_STATE_DISTRIBUTING;
2093		- port->actor_oper_port_state &= ~AD_STATE_AGGREGATION;
	2096	+ port->actor_oper_port_state &= ~LACP_STATE_SYNCHRONIZATION;
	2097	+ port->actor_oper_port_state &= ~LACP_STATE_COLLECTING;
	2098	+ port->actor_oper_port_state &= ~LACP_STATE_DISTRIBUTING;
	2099	+ port->actor_oper_port_state &= ~LACP_STATE_AGGREGATION;
2094	2100	__update_lacpdu_from_port(port);
2095	2101	ad_lacpdu_send(port);
2096	2102
..	..	@@ -2122,14 +2128,14 @@
2122	2128	* new aggregator
2123	2129	*/
2124	2130	if ((new_aggregator) && ((!new_aggregator->lag_ports) \|\| ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator))) {
2125		- netdev_dbg(bond->dev, "Some port(s) related to LAG %d - replacing with LAG %d\n",
2126		- aggregator->aggregator_identifier,
2127		- new_aggregator->aggregator_identifier);
	2131	+ slave_dbg(bond->dev, slave->dev, "Some port(s) related to LAG %d - replacing with LAG %d\n",
	2132	+ aggregator->aggregator_identifier,
	2133	+ new_aggregator->aggregator_identifier);
2128	2134
2129	2135	if ((new_aggregator->lag_ports == port) &&
2130	2136	new_aggregator->is_active) {
2131		- netdev_info(bond->dev, "Removing an active aggregator\n");
2132		- select_new_active_agg = 1;
	2137	+ slave_info(bond->dev, slave->dev, "Removing an active aggregator\n");
	2138	+ select_new_active_agg = 1;
2133	2139	}
2134	2140
2135	2141	new_aggregator->is_individual = aggregator->is_individual;
..	..	@@ -2159,7 +2165,7 @@
2159	2165	ad_agg_selection_logic(__get_first_agg(port),
2160	2166	&dummy_slave_update);
2161	2167	} else {
2162		- netdev_warn(bond->dev, "unbinding aggregator, and could not find a new aggregator for its ports\n");
	2168	+ slave_warn(bond->dev, slave->dev, "unbinding aggregator, and could not find a new aggregator for its ports\n");
2163	2169	}
2164	2170	} else {
2165	2171	/* in case that the only port related to this
..	..	@@ -2168,7 +2174,7 @@
2168	2174	select_new_active_agg = aggregator->is_active;
2169	2175	ad_clear_agg(aggregator);
2170	2176	if (select_new_active_agg) {
2171		- netdev_info(bond->dev, "Removing an active aggregator\n");
	2177	+ slave_info(bond->dev, slave->dev, "Removing an active aggregator\n");
2172	2178	/* select new active aggregator */
2173	2179	temp_aggregator = __get_first_agg(port);
2174	2180	if (temp_aggregator)
..	..	@@ -2178,7 +2184,7 @@
2178	2184	}
2179	2185	}
2180	2186
2181		- netdev_dbg(bond->dev, "Unbinding port %d\n", port->actor_port_number);
	2187	+ slave_dbg(bond->dev, slave->dev, "Unbinding port %d\n", port->actor_port_number);
2182	2188
2183	2189	/* find the aggregator that this port is connected to */
2184	2190	bond_for_each_slave(bond, slave_iter, iter) {
..	..	@@ -2199,9 +2205,10 @@
2199	2205	temp_aggregator->num_of_ports--;
2200	2206	if (__agg_active_ports(temp_aggregator) == 0) {
2201	2207	select_new_active_agg = temp_aggregator->is_active;
2202		- ad_clear_agg(temp_aggregator);
	2208	+ if (temp_aggregator->num_of_ports == 0)
	2209	+ ad_clear_agg(temp_aggregator);
2203	2210	if (select_new_active_agg) {
2204		- netdev_info(bond->dev, "Removing an active aggregator\n");
	2211	+ slave_info(bond->dev, slave->dev, "Removing an active aggregator\n");
2205	2212	/* select new active aggregator */
2206	2213	ad_agg_selection_logic(__get_first_agg(port),
2207	2214	&dummy_slave_update);
..	..	@@ -2273,7 +2280,7 @@
2273	2280
2274	2281	/**
2275	2282	* bond_3ad_state_machine_handler - handle state machines timeout
2276		- * @bond: bonding struct to work on
	2283	+ * @work: work context to fetch bonding struct to work on from
2277	2284	*
2278	2285	* The state machine handling concept in this module is to check every tick
2279	2286	* which state machine should operate any function. The execution order is
..	..	@@ -2369,66 +2376,68 @@
2369	2376	* bond_3ad_rx_indication - handle a received frame
2370	2377	* @lacpdu: received lacpdu
2371	2378	* @slave: slave struct to work on
2372		- * @length: length of the data received
2373	2379	*
2374	2380	* It is assumed that frames that were sent on this NIC don't returned as new
2375	2381	* received frames (loopback). Since only the payload is given to this
2376	2382	* function, it check for loopback.
2377	2383	*/
2378		-static int bond_3ad_rx_indication(struct lacpdu lacpdu, struct slave slave,
2379		- u16 length)
	2384	+static int bond_3ad_rx_indication(struct lacpdu lacpdu, struct slave slave)
2380	2385	{
2381		- struct port *port;
	2386	+ struct bonding *bond = slave->bond;
2382	2387	int ret = RX_HANDLER_ANOTHER;
	2388	+ struct bond_marker *marker;
	2389	+ struct port *port;
	2390	+ atomic64_t *stat;
2383	2391
2384		- if (length >= sizeof(struct lacpdu)) {
2385		-
2386		- port = &(SLAVE_AD_INFO(slave)->port);
2387		-
2388		- if (!port->slave) {
2389		- net_warn_ratelimited("%s: Warning: port of slave %s is uninitialized\n",
2390		- slave->dev->name, slave->bond->dev->name);
2391		- return ret;
2392		- }
2393		-
2394		- switch (lacpdu->subtype) {
2395		- case AD_TYPE_LACPDU:
2396		- ret = RX_HANDLER_CONSUMED;
2397		- netdev_dbg(slave->bond->dev,
2398		- "Received LACPDU on port %d slave %s\n",
2399		- port->actor_port_number,
2400		- slave->dev->name);
2401		- /* Protect against concurrent state machines */
2402		- spin_lock(&slave->bond->mode_lock);
2403		- ad_rx_machine(lacpdu, port);
2404		- spin_unlock(&slave->bond->mode_lock);
2405		- break;
2406		-
2407		- case AD_TYPE_MARKER:
2408		- ret = RX_HANDLER_CONSUMED;
2409		- /* No need to convert fields to Little Endian since we
2410		- * don't use the marker's fields.
2411		- */
2412		-
2413		- switch (((struct bond_marker *)lacpdu)->tlv_type) {
2414		- case AD_MARKER_INFORMATION_SUBTYPE:
2415		- netdev_dbg(slave->bond->dev, "Received Marker Information on port %d\n",
2416		- port->actor_port_number);
2417		- ad_marker_info_received((struct bond_marker *)lacpdu, port);
2418		- break;
2419		-
2420		- case AD_MARKER_RESPONSE_SUBTYPE:
2421		- netdev_dbg(slave->bond->dev, "Received Marker Response on port %d\n",
2422		- port->actor_port_number);
2423		- ad_marker_response_received((struct bond_marker *)lacpdu, port);
2424		- break;
2425		-
2426		- default:
2427		- netdev_dbg(slave->bond->dev, "Received an unknown Marker subtype on slot %d\n",
2428		- port->actor_port_number);
2429		- }
2430		- }
	2392	+ port = &(SLAVE_AD_INFO(slave)->port);
	2393	+ if (!port->slave) {
	2394	+ net_warn_ratelimited("%s: Warning: port of slave %s is uninitialized\n",
	2395	+ slave->dev->name, slave->bond->dev->name);
	2396	+ return ret;
2431	2397	}
	2398	+
	2399	+ switch (lacpdu->subtype) {
	2400	+ case AD_TYPE_LACPDU:
	2401	+ ret = RX_HANDLER_CONSUMED;
	2402	+ slave_dbg(slave->bond->dev, slave->dev,
	2403	+ "Received LACPDU on port %d\n",
	2404	+ port->actor_port_number);
	2405	+ /* Protect against concurrent state machines */
	2406	+ spin_lock(&slave->bond->mode_lock);
	2407	+ ad_rx_machine(lacpdu, port);
	2408	+ spin_unlock(&slave->bond->mode_lock);
	2409	+ break;
	2410	+ case AD_TYPE_MARKER:
	2411	+ ret = RX_HANDLER_CONSUMED;
	2412	+ /* No need to convert fields to Little Endian since we
	2413	+ * don't use the marker's fields.
	2414	+ */
	2415	+ marker = (struct bond_marker *)lacpdu;
	2416	+ switch (marker->tlv_type) {
	2417	+ case AD_MARKER_INFORMATION_SUBTYPE:
	2418	+ slave_dbg(slave->bond->dev, slave->dev, "Received Marker Information on port %d\n",
	2419	+ port->actor_port_number);
	2420	+ ad_marker_info_received(marker, port);
	2421	+ break;
	2422	+ case AD_MARKER_RESPONSE_SUBTYPE:
	2423	+ slave_dbg(slave->bond->dev, slave->dev, "Received Marker Response on port %d\n",
	2424	+ port->actor_port_number);
	2425	+ ad_marker_response_received(marker, port);
	2426	+ break;
	2427	+ default:
	2428	+ slave_dbg(slave->bond->dev, slave->dev, "Received an unknown Marker subtype on port %d\n",
	2429	+ port->actor_port_number);
	2430	+ stat = &SLAVE_AD_INFO(slave)->stats.marker_unknown_rx;
	2431	+ atomic64_inc(stat);
	2432	+ stat = &BOND_AD_INFO(bond).stats.marker_unknown_rx;
	2433	+ atomic64_inc(stat);
	2434	+ }
	2435	+ break;
	2436	+ default:
	2437	+ atomic64_inc(&SLAVE_AD_INFO(slave)->stats.lacpdu_unknown_rx);
	2438	+ atomic64_inc(&BOND_AD_INFO(bond).stats.lacpdu_unknown_rx);
	2439	+ }
	2440	+
2432	2441	return ret;
2433	2442	}
2434	2443
..	..	@@ -2467,9 +2476,10 @@
2467	2476
2468	2477	if (!reset) {
2469	2478	if (!speed) {
2470		- netdev_err(port->slave->dev,
2471		- "speed changed to 0 for port %s",
2472		- port->slave->dev->name);
	2479	+ slave_err(port->slave->bond->dev,
	2480	+ port->slave->dev,
	2481	+ "speed changed to 0 on port %d\n",
	2482	+ port->actor_port_number);
2473	2483	} else if (duplex && ospeed != speed) {
2474	2484	/* Speed change restarts LACP state-machine */
2475	2485	port->sm_vars \|= AD_PORT_BEGIN;
..	..	@@ -2494,23 +2504,22 @@
2494	2504
2495	2505	/* if slave is null, the whole port is not initialized */
2496	2506	if (!port->slave) {
2497		- netdev_warn(slave->bond->dev,
2498		- "speed/duplex changed for uninitialized port %s\n",
2499		- slave->dev->name);
	2507	+ slave_warn(slave->bond->dev, slave->dev,
	2508	+ "speed/duplex changed for uninitialized port\n");
2500	2509	return;
2501	2510	}
2502	2511
2503	2512	spin_lock_bh(&slave->bond->mode_lock);
2504	2513	ad_update_actor_keys(port, false);
2505	2514	spin_unlock_bh(&slave->bond->mode_lock);
2506		- netdev_dbg(slave->bond->dev, "Port %d slave %s changed speed/duplex\n",
2507		- port->actor_port_number, slave->dev->name);
	2515	+ slave_dbg(slave->bond->dev, slave->dev, "Port %d changed speed/duplex\n",
	2516	+ port->actor_port_number);
2508	2517	}
2509	2518
2510	2519	/**
2511	2520	* bond_3ad_handle_link_change - handle a slave's link status change indication
2512	2521	* @slave: slave struct to work on
2513		- * @status: whether the link is now up or down
	2522	+ * @link: whether the link is now up or down
2514	2523	*
2515	2524	* Handle reselection of aggregator (if needed) for this port.
2516	2525	*/
..	..	@@ -2524,8 +2533,7 @@
2524	2533
2525	2534	/* if slave is null, the whole port is not initialized */
2526	2535	if (!port->slave) {
2527		- netdev_warn(slave->bond->dev, "link status changed for uninitialized port on %s\n",
2528		- slave->dev->name);
	2536	+ slave_warn(slave->bond->dev, slave->dev, "link status changed for uninitialized port\n");
2529	2537	return;
2530	2538	}
2531	2539
..	..	@@ -2550,9 +2558,9 @@
2550	2558
2551	2559	spin_unlock_bh(&slave->bond->mode_lock);
2552	2560
2553		- netdev_dbg(slave->bond->dev, "Port %d changed link status to %s\n",
2554		- port->actor_port_number,
2555		- link == BOND_LINK_UP ? "UP" : "DOWN");
	2561	+ slave_dbg(slave->bond->dev, slave->dev, "Port %d changed link status to %s\n",
	2562	+ port->actor_port_number,
	2563	+ link == BOND_LINK_UP ? "UP" : "DOWN");
2556	2564
2557	2565	/* RTNL is held and mode_lock is released so it's safe
2558	2566	* to update slave_array here.
..	..	@@ -2562,7 +2570,7 @@
2562	2570
2563	2571	/**
2564	2572	* bond_3ad_set_carrier - set link state for bonding master
2565		- * @bond - bonding structure
	2573	+ * @bond: bonding structure
2566	2574	*
2567	2575	* if we have an active aggregator, we're up, if not, we're down.
2568	2576	* Presumes that we cannot have an active aggregator if there are
..	..	@@ -2664,15 +2672,18 @@
2664	2672	return RX_HANDLER_ANOTHER;
2665	2673
2666	2674	lacpdu = skb_header_pointer(skb, 0, sizeof(_lacpdu), &_lacpdu);
2667		- if (!lacpdu)
	2675	+ if (!lacpdu) {
	2676	+ atomic64_inc(&SLAVE_AD_INFO(slave)->stats.lacpdu_illegal_rx);
	2677	+ atomic64_inc(&BOND_AD_INFO(bond).stats.lacpdu_illegal_rx);
2668	2678	return RX_HANDLER_ANOTHER;
	2679	+ }
2669	2680
2670		- return bond_3ad_rx_indication(lacpdu, slave, skb->len);
	2681	+ return bond_3ad_rx_indication(lacpdu, slave);
2671	2682	}
2672	2683
2673	2684	/**
2674	2685	* bond_3ad_update_lacp_rate - change the lacp rate
2675		- * @bond - bonding struct
	2686	+ * @bond: bonding struct
2676	2687	*
2677	2688	* When modify lacp_rate parameter via sysfs,
2678	2689	* update actor_oper_port_state of each port.
..	..	@@ -2693,9 +2704,67 @@
2693	2704	bond_for_each_slave(bond, slave, iter) {
2694	2705	port = &(SLAVE_AD_INFO(slave)->port);
2695	2706	if (lacp_fast)
2696		- port->actor_oper_port_state \|= AD_STATE_LACP_TIMEOUT;
	2707	+ port->actor_oper_port_state \|= LACP_STATE_LACP_TIMEOUT;
2697	2708	else
2698		- port->actor_oper_port_state &= ~AD_STATE_LACP_TIMEOUT;
	2709	+ port->actor_oper_port_state &= ~LACP_STATE_LACP_TIMEOUT;
2699	2710	}
2700	2711	spin_unlock_bh(&bond->mode_lock);
2701	2712	}
	2713	+
	2714	+size_t bond_3ad_stats_size(void)
	2715	+{
	2716	+ return nla_total_size_64bit(sizeof(u64)) + /* BOND_3AD_STAT_LACPDU_RX */
	2717	+ nla_total_size_64bit(sizeof(u64)) + /* BOND_3AD_STAT_LACPDU_TX */
	2718	+ nla_total_size_64bit(sizeof(u64)) + /* BOND_3AD_STAT_LACPDU_UNKNOWN_RX */
	2719	+ nla_total_size_64bit(sizeof(u64)) + /* BOND_3AD_STAT_LACPDU_ILLEGAL_RX */
	2720	+ nla_total_size_64bit(sizeof(u64)) + /* BOND_3AD_STAT_MARKER_RX */
	2721	+ nla_total_size_64bit(sizeof(u64)) + /* BOND_3AD_STAT_MARKER_TX */
	2722	+ nla_total_size_64bit(sizeof(u64)) + /* BOND_3AD_STAT_MARKER_RESP_RX */
	2723	+ nla_total_size_64bit(sizeof(u64)) + /* BOND_3AD_STAT_MARKER_RESP_TX */
	2724	+ nla_total_size_64bit(sizeof(u64)); /* BOND_3AD_STAT_MARKER_UNKNOWN_RX */
	2725	+}
	2726	+
	2727	+int bond_3ad_stats_fill(struct sk_buff skb, struct bond_3ad_stats stats)
	2728	+{
	2729	+ u64 val;
	2730	+
	2731	+ val = atomic64_read(&stats->lacpdu_rx);
	2732	+ if (nla_put_u64_64bit(skb, BOND_3AD_STAT_LACPDU_RX, val,
	2733	+ BOND_3AD_STAT_PAD))
	2734	+ return -EMSGSIZE;
	2735	+ val = atomic64_read(&stats->lacpdu_tx);
	2736	+ if (nla_put_u64_64bit(skb, BOND_3AD_STAT_LACPDU_TX, val,
	2737	+ BOND_3AD_STAT_PAD))
	2738	+ return -EMSGSIZE;
	2739	+ val = atomic64_read(&stats->lacpdu_unknown_rx);
	2740	+ if (nla_put_u64_64bit(skb, BOND_3AD_STAT_LACPDU_UNKNOWN_RX, val,
	2741	+ BOND_3AD_STAT_PAD))
	2742	+ return -EMSGSIZE;
	2743	+ val = atomic64_read(&stats->lacpdu_illegal_rx);
	2744	+ if (nla_put_u64_64bit(skb, BOND_3AD_STAT_LACPDU_ILLEGAL_RX, val,
	2745	+ BOND_3AD_STAT_PAD))
	2746	+ return -EMSGSIZE;
	2747	+
	2748	+ val = atomic64_read(&stats->marker_rx);
	2749	+ if (nla_put_u64_64bit(skb, BOND_3AD_STAT_MARKER_RX, val,
	2750	+ BOND_3AD_STAT_PAD))
	2751	+ return -EMSGSIZE;
	2752	+ val = atomic64_read(&stats->marker_tx);
	2753	+ if (nla_put_u64_64bit(skb, BOND_3AD_STAT_MARKER_TX, val,
	2754	+ BOND_3AD_STAT_PAD))
	2755	+ return -EMSGSIZE;
	2756	+ val = atomic64_read(&stats->marker_resp_rx);
	2757	+ if (nla_put_u64_64bit(skb, BOND_3AD_STAT_MARKER_RESP_RX, val,
	2758	+ BOND_3AD_STAT_PAD))
	2759	+ return -EMSGSIZE;
	2760	+ val = atomic64_read(&stats->marker_resp_tx);
	2761	+ if (nla_put_u64_64bit(skb, BOND_3AD_STAT_MARKER_RESP_TX, val,
	2762	+ BOND_3AD_STAT_PAD))
	2763	+ return -EMSGSIZE;
	2764	+ val = atomic64_read(&stats->marker_unknown_rx);
	2765	+ if (nla_put_u64_64bit(skb, BOND_3AD_STAT_MARKER_UNKNOWN_RX, val,
	2766	+ BOND_3AD_STAT_PAD))
	2767	+ return -EMSGSIZE;
	2768	+
	2769	+ return 0;
	2770	+}