From patchwork Thu Feb 22 09:04:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Sm9uZXMgU3l1ZSDolpvmh7flrpc=?= X-Patchwork-Id: 13566927 X-Patchwork-Delegate: kuba@kernel.org Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2115.outbound.protection.outlook.com [40.107.215.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16DB11B59E for ; Thu, 22 Feb 2024 09:04:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.215.115 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708592687; cv=fail; b=EcPE0tbFjItoMCZEBoLPgwFjTO1FRuNhqW1lYvZO3IwOdsVtI8h8WS5atGo1CVrjPa7aUpjj7qLbC5+7+ZRskjkl07qhekF9Yo3wgIa2XgE8XfOpgAaaKGRd1pSTgBvImQdVmmH25FdeZkO8jdmoTzVMKvz7WJNjKWexvoeXOYs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708592687; c=relaxed/simple; bh=5dzK3SHIM8ncaz2GzLJSykiHvLKHuz3pOvAUqhI/nJM=; h=From:To:Subject:Date:Message-ID:Content-Type:MIME-Version; b=TJ9ypoLvikAM3oTPgT3W4zti0SeGPCwAeq2M9LHzSrql2ycf1v4fL4+QvfYPNlrndJbxV5lTC6jPSRIlSNd8IDi3yYdLqvvguxR0w0YrSCcklK4KoKuGBfPE0y+2b+dam/OoiK6/Sn8k4q9otj0WctB+lDiDLgzyNfrDDD4h8XE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=qnap.com; spf=pass smtp.mailfrom=qnap.com; dkim=pass (2048-bit key) header.d=qnap.com header.i=@qnap.com header.b=fkohUpNk; arc=fail smtp.client-ip=40.107.215.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=qnap.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qnap.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qnap.com header.i=@qnap.com header.b="fkohUpNk" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EnOboASEoMXVpBz+fIi04HLsMwCsRtv8wwPr3NsibypMoOHqi0RWIFrePhuYqy1Q1M1ij6NfB2JOWkAHkx1UOcT6R0q1Kuq3jGfLmRqt70E3JdjE4HkxPiQC9t9pMpQvJ0u5GsoQ7Y8mBQfJZKYXMz9Su7237P8YDNeZoHlKqnrX6ZXQLHhhDYuupzygmbvXRx83GHvn4kooZ3JRq+JOi2h1VkBmPdrkXx3ZEK+bMVzkFGoLi8TMo2jkaWjkse+ltpkzLW8gwKxzoiEzgno2GTrcY9DdwJWv/T92z3dVzVDPmKXblyzQFfLGFt1OBN5xZc4Z6uSFVhguk0ihfSDvJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KiiZOQY6MsYZe7B1ekYXeSxjsT5koXMHE1xQJjFyOUw=; b=GtkS4oHApzTNIjXwq4hXxoxPtuH9RDf9PLmSssldVzH56+SshgKGVHxwkhLxoON/qCeQhaTbJEY13DsIdtItVvEW0qAME3MASdMvz36BhzvbKPp5B0WS/56M2QrSywLX6Q5K+3g+LhmrVZGWZKoq/Xh/aAV+x3N14vqSOc91nKr03qaq2xsPtB+z+uYhnj2kSPpoxQjOT2taygTde2I5pdPmGBm3L8t6AXVHf41VeF4naV9tVaQsViMDV31/00XCByn3jnZLIgscaGDPUUQ2tMzWfhR+i1md+T217Ay/Tp8ZvRyJWqD11/V86qOhkxxhNO2cSNe6A9d/CM+pYHtarw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=qnap.com; dmarc=pass action=none header.from=qnap.com; dkim=pass header.d=qnap.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qnap.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KiiZOQY6MsYZe7B1ekYXeSxjsT5koXMHE1xQJjFyOUw=; b=fkohUpNk6MpA2xAWgku3R0S3xXx6IaeKr7rJjzJDmAx+x7+eeOV02l78B/iRknoMWhg1vhaejJ58vo3iL+5qk9gBWCo7Zc5aAlolWFk5vV1SP8xgGUifRPingxIRdtZYIHL5oVTb4jzpQ76y0vzL+RCKKV/rvHtv5NJgkJtcWO34MQBa2WOmktOFIxQs5rpXuSQEulKGHeJaW7G8ptc1FMxDN5qlIMULIL0YdUXuM9Tq14JtgsM54gSUxgS/2a96rGskxXQomTiorBuEiQpZBnsu1fPx1CM3ClT7k5ckwEmhfCHUlBjE/mvHw3XV2fuiKK/NLlmKkufmY87GjaG2Ww== Received: from SI2PR04MB5097.apcprd04.prod.outlook.com (2603:1096:4:14d::9) by SEZPR04MB5947.apcprd04.prod.outlook.com (2603:1096:101:66::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Thu, 22 Feb 2024 09:04:36 +0000 Received: from SI2PR04MB5097.apcprd04.prod.outlook.com ([fe80::2f40:e11f:9d69:5bf5]) by SI2PR04MB5097.apcprd04.prod.outlook.com ([fe80::2f40:e11f:9d69:5bf5%7]) with mapi id 15.20.7316.023; Thu, 22 Feb 2024 09:04:36 +0000 From: =?iso-2022-jp?b?Sm9uZXMgU3l1ZSAbJEJpLVhnPSEbKEI=?= To: "netdev@vger.kernel.org" Subject: [PATCH net-next] bonding: 802.3ad replace MAC_ADDRESS_EQUAL with __agg_has_partner Thread-Topic: [PATCH net-next] bonding: 802.3ad replace MAC_ADDRESS_EQUAL with __agg_has_partner Thread-Index: AQHaZWtNDF12TJHYYEeyVWmKAhc8pw== Date: Thu, 22 Feb 2024 09:04:36 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=qnap.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SI2PR04MB5097:EE_|SEZPR04MB5947:EE_ x-ms-office365-filtering-correlation-id: a7bc9e10-1419-4c0a-a21c-08dc33854b60 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 0Hc0xf3AxIVaey4Xvwtcy1pYUHfhiYxF3OSAjQUsk1amtLBbb7Fdms85/uSWEmselUQpIKWBtKb4ocpOrvQMrrty9yYe+TNlpjfHPyK/Sos6nS0qwIsyidH/L4WAhYBU6I+Yzu00D1jDwpnlC+dQq3stGxU2ACvbiNaAcRg7CgVYBkp8a/KTGHpJp+UBSpMKwZgsyg9pGcgWKcZSMUUlj4WupJrfdycnSoDowm4jetBaXtm9pyXhwshHNAnulL6xyjp3eiK/uAyKh1Jju3mpPgua7EQyzF9tQFyP6FzDeboWSSDVa1WEHyqjr40awJ+yQ6HAyQ2ukl/urO1dz3gXgTGDQuJI+1zw8YLW9f+mFwKfbhBRrcA6mK+cPEY8wPpflDwXu5h4UbBqKYpqW33uQHBduzZldvZwiGpX7pZYHnVROoA/Y//YbkonHEXyB4WGijuj/qYRB7KTpmxORISL6VTHeKpit2NTnV5lAzhyl22MO7o0+1tBEDtFw2rYuD/StwhgfOGjmev7vMfWpNikiu5LI2Iw53J7B7c4chlX1XpoKIjeBoRLXeVzt7XSqOzKXAFa2kVviicZo6HETNOjhntizCv0W3IgrXK2PxIEBeTwpLpLvEHfi1m+YrjCgt/7 x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR04MB5097.apcprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(38070700009);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-2022-jp?b?NnpEREpuSGhSYzR4VzlN?= =?iso-2022-jp?b?VXJJL1RyL2RxUWFUSnI0cFpOUzJHb2MySVZvV2V5OXVEUFl1ZUhpd2o3?= =?iso-2022-jp?b?Yk9IYTZDTHQ4YXhJaDMxeThPc2hCNnN1ZFc5RVhvN3ArcTZmSG16TVcx?= =?iso-2022-jp?b?WXdMVkxoak50SmsxOS81QWdMYUcxQVVFYkxsRXdKa2tyekRWc1J2VUxq?= =?iso-2022-jp?b?UmJvT1pxQitnZWpYcXIyMXdlVDlTckNFaHZNRG56eUdONnZCUERwYS81?= =?iso-2022-jp?b?RHBWdU9qeTVkNUdGUlpnMWVSNllFbXdxQzYvVlZ5V015c25YLzJWUmpn?= =?iso-2022-jp?b?UWdPSUptZklzRXFQVFNXYjFoaUFpenZqck5QWUE4d0V2R0ozeGZnY0lj?= =?iso-2022-jp?b?K1I3bE1QN1Erck50L2VZMlgrazJJTEpwT3RDRDI0T1pORFhuSzZpb1p6?= =?iso-2022-jp?b?cURMN2FGMU5URHVSM3F6ZmQ0ZmRkbmNScjE3cG1lUTlHOXY2L0JKRmtV?= =?iso-2022-jp?b?RkdGN1JZOFFvQkdXQ1R4NVVjTTVqcXFYdTNtR3FzcTRXbjBIMjZ4UWlC?= =?iso-2022-jp?b?LzBJV1k1V2dwMk9PMDZuV2I0VFFUOWlwNmJEbVdEL3BMVVdsNXAyZmNP?= =?iso-2022-jp?b?c056MTN0cUdiTTQ5WHpzeGN2Q1hRK2I4eXJHenBoQ2NSWjVzSlNTTkN3?= =?iso-2022-jp?b?ekQyYTlhb1V5RERpQU9nbWlSQmJKYmFvRWVjMkN6RDdoc3M3SFlhZXRH?= =?iso-2022-jp?b?RERvTUI3N0ZFeU96dHB4bnlNL01XL0ZKVzhzenljS0VJbW91YUpwaGRp?= =?iso-2022-jp?b?NHZja3pZMVVtQXBYU09Tbzk4WWNaVmlNT0VYaXU4dVBEajBaS003VWlL?= =?iso-2022-jp?b?YUx5dzVsaTM2V1E2dmp5M1ZMZmE1SnhyTm5YbmFQRFliVU9LT0tqdVlQ?= =?iso-2022-jp?b?V1VtQWw1TWRVcHlqWHIya2p0TWZ2d0JVVFNmZFNlMzZtOWNlWVBiUzFQ?= =?iso-2022-jp?b?ZUFzWklRMXgvNkV1TjhZZlIvcVlRclM4eDI1ZFoxNUpORi9QbXZsWFBR?= =?iso-2022-jp?b?RCtQUmcvQnl2a3FnUmE1dGtCMjRjMzV3Q0lYaGNoRVplYjljWi85QnRE?= =?iso-2022-jp?b?YWF1a1hKK3lRQnR1eUNwVHVBMTlFQUtkUDZFNnYwcHFaaGMwV0NxOFli?= =?iso-2022-jp?b?R3lCUDh3ZGl1cWsveEEybkk3N1JiaEY3eE9mNTExdGhHUi81REMzcEU2?= =?iso-2022-jp?b?cnJ2TUxHOHZCRFBtR2o0NGp1QXd4bk9xSUFHa1RvSnN4S0NiYzdRbWto?= =?iso-2022-jp?b?VU43NmdpUzBYdk9uQS9QeDRONTBrNk81S1FZVGdob2J1b2FSdTI3VGo4?= =?iso-2022-jp?b?Z1VkM1A3OEhSSmg1bXR1TkNQSnd3dXYvMjhFak9yQnE3OFNzbUxNODRi?= =?iso-2022-jp?b?Zjd5RFBzRnJPWUd2MTRpQnd6QldudjBoWnRDSk0wWjEwMW9Nd2h0S0p3?= =?iso-2022-jp?b?eW1NMnF5NkRjMkpSSnB1QXBtNmJIY3R6RnJnUjM2K0lYR1JLQklHaDJh?= =?iso-2022-jp?b?ZGI4eEd1eEJwQmZLY1dDZlJldVhPUWNBMWlUVmxhQnQ3M2grRlc5M28w?= =?iso-2022-jp?b?eWE0WWUrcmhoUUVLL2NqaFE4K0NGUWZKZUtKUit2U1ZnV0lQdnFJbnht?= =?iso-2022-jp?b?UEVMVS9zRUszQmt3bGRuMEtuT24wdjh0TUllODFhdHdVbytsajl3ZDda?= =?iso-2022-jp?b?UDFnMVp5Y3FSR3h4RUlGb1RUdlVMTWY2YWxWSkx2WlgzWXRXcnNUUXRm?= =?iso-2022-jp?b?dnRtTXNZb3A0U0ZUNmY0WGVkVTVMWUVGakhYMUFLK3NpSnZ6WEhhUXpS?= =?iso-2022-jp?b?NkdXWDgxcUJQMmhCdVBJS3FoREZxTzFKNzI1R0ZQQkYzdUI4ZEtreVAw?= =?iso-2022-jp?b?dEtMWlpGSmlsdmtOTWpmOC9EVkp3Y3k0dGtaenhURjdpRmJRY21jeFEx?= =?iso-2022-jp?b?bFN4UERPWHdyZVE2MVpXaWZtY09lMjRlbTQ5K1NjNjdBdDR0RitkQU10?= =?iso-2022-jp?b?QTJOck0zUTVLNjBSMkN1QzMzYy9tczF1b3JDek1JQmtTZlVNVjdzM3pH?= =?iso-2022-jp?b?ejIzNmc3UHV4VGhiWG1NWlN0SzA5Y2s3ZWp6Uis1Mlh4RksrTUlaT3Yv?= =?iso-2022-jp?b?TWt1QzZpc0hFVmlDdjJnTGJINXdrbWFCSEw3TGdacVdNbVVqRGZFMWpK?= =?iso-2022-jp?b?OXR6RldqVFd3NmFES1VkMTJIbjBzK3E5SEk3RzVFK3QwTDhjSzFtall5?= =?iso-2022-jp?b?MnlSQmZNY1pFaz0=?= Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-OriginatorOrg: qnap.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SI2PR04MB5097.apcprd04.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7bc9e10-1419-4c0a-a21c-08dc33854b60 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Feb 2024 09:04:36.7983 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 6eba8807-6ef0-4e31-890c-a6ecfbb98568 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: eMtI9zH1Sl+fElv67p2tBNk3yzrY/ZWhanvqcjDvO5xsKamrYJXMsA0yri1yG/j2XCwt1ZAGf8LDdVJhpy4fDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR04MB5947 X-Patchwork-Delegate: kuba@kernel.org They are verifying the same thing: if aggregator has a partner or not. Replaces macro with inline function would look more clear to understand. Signed-off-by: Jones Syue --- drivers/net/bonding/bond_3ad.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index f2942e8..eb3c2d1 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -2036,9 +2036,7 @@ static void ad_enable_collecting(struct port *port) */ static void ad_disable_distributing(struct port *port, bool *update_slave_arr) { - if (port->aggregator && - !MAC_ADDRESS_EQUAL(&port->aggregator->partner_system, - &(null_mac_addr))) { + if (port->aggregator && __agg_has_partner(port->aggregator)) { slave_dbg(port->slave->bond->dev, port->slave->dev, "Disabling distributing on port %d (LAG %d)\n", port->actor_port_number, @@ -2078,9 +2076,7 @@ static void ad_enable_collecting_distributing(struct port *port, static void ad_disable_collecting_distributing(struct port *port, bool *update_slave_arr) { - if (port->aggregator && - !MAC_ADDRESS_EQUAL(&(port->aggregator->partner_system), - &(null_mac_addr))) { + if (port->aggregator && __agg_has_partner(port->aggregator)) { slave_dbg(port->slave->bond->dev, port->slave->dev, "Disabling port %d (LAG %d)\n", port->actor_port_number,