From: Bryan Brattlof <bb@ti.com>
Date: Tue, 8 Apr 2025 21:57:34 +0000 (-0500)
Subject: net: dhcpv6: remove excluded middle expression
X-Git-Tag: v2025.07-rc1~35^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=473032619f5056ede0517e1a926b09d0038567ed;p=pandora-u-boot.git

net: dhcpv6: remove excluded middle expression

!A || (A && B) is equivalent to !A || B

Drop the middle expression from the statement

Signed-off-by: Bryan Brattlof <bb@ti.com>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
---

diff --git a/net/dhcpv6.c b/net/dhcpv6.c
index 984a64a4ff3..0c2de75ba1d 100644
--- a/net/dhcpv6.c
+++ b/net/dhcpv6.c
@@ -473,8 +473,7 @@ static int dhcp6_check_advertise_packet(uchar *rx_pkt, unsigned int len)
 		 * server UID, save the new server UID and preference
 		 */
 		if (!sm_params.server_uid.uid_ptr ||
-		    (sm_params.server_uid.uid_ptr &&
-		    sm_params.server_uid.preference < sm_params.rx_status.preference)) {
+		    sm_params.server_uid.preference < sm_params.rx_status.preference) {
 			rx_uid_size = sm_params.rx_status.server_uid_size;
 			if (sm_params.server_uid.uid_ptr)
 				free(sm_params.server_uid.uid_ptr);