From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BE2730FC06 for ; Tue, 14 Oct 2025 08:03:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760428983; cv=none; b=nR83jWlMMyN5N8cDRVHRk06VN3I2ZMH5iSwGhIjXNkAxyeIvxSnt09wsEQ6arBPlg8bL0ZzX1s/ya4GcX2P3exzBgEMVQpViZc4iIVRD2kLNMx/Zc/CzQek7ZPxeUvXVbeApXXkCtZH42s8mcgsjGlsAgPVv+rpFRT9NEWNVLpU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760428983; c=relaxed/simple; bh=lH3Fg0xYXRRKlOcO2hIA1PKojnFE7636KmAX1iarqLE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JjYXO1Pr3HVi7pKlfqs1IgG7slcoDj36dfAPedFtBIp5jTR26xsXnZn/Yoi2CJPH3MKEcoB0u1GHyOWJIOjH88RxtajTmT/UiwndUKIc0p8QjRyuanaIYE7R4tmIniGP89QIpBkB4iJC1d3JAVUllq/KyiIRElvK469Us+JQKjU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=g2C41zQJ; arc=none smtp.client-ip=209.85.210.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g2C41zQJ" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-77f605f22easo4347320b3a.2 for ; Tue, 14 Oct 2025 01:03:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760428980; x=1761033780; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c6CIivt01bOqUoEaRvA5upBzPrQco5NjM7gJAaWtH0s=; b=g2C41zQJjuwDI67yltLMcXdAOVYUIPtcSJUT8dpeoBo88e/9f97HXvu5r4KG/FwFI5 f/ua0emcRxJsH+orpQzpULCcjhyqfZNFavTdnZdldoBAr4GWklXVMt9XCPIRHbv3E1Fu A3nDdnEM1sAZtR59+Q9HgfwE/Psr/eEHA4Lq4Wa+Wjcm+uN7Cd+iwH8VEFuvukA2UL5U kfsJwFelc/WJ03+jrKpQv1eoQem7cHx9yW+6AjCBPuE+ndq16Dx/2xXdUTl7HAO5UXaR HnLB0ssKbUqRYHJEEQ0tdEnNzJo2CYYRVxElYzOjTPfupX1fvr0aW4aXxEVHR2cF5CC8 FEGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760428980; x=1761033780; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c6CIivt01bOqUoEaRvA5upBzPrQco5NjM7gJAaWtH0s=; b=lwvcnAHC2DRK3JWwT/cHvDNh4MWapWWR4iIifn6NPr/MmVvktMIsw2pm2dRELwJDtv 7eRx2swPxiNFKiK5A6xtncp+4q0QjGdBp6g/0P0/gla2+mf86cABLshhR+yUS4rV+eWG tzttr5DnrLo7r90VjfrW3ae59A3ji1GoIpPTXKn6phI0FrAZx0v0gFHfHmUncg4zbbmV YbTKuyTFIiviFQQfn77GAe0UXTFNhxQMl34MKzUEfin6PAgQrzLQRSTFlxxIMg5BgWLQ sJl7LHYO7yjehtJMz6oohrC3W6RiHOECb1xiT6lrcw5yK2owRGUR5r2vX0ofUVlW81cf ytxQ== X-Gm-Message-State: AOJu0YyrEpUQpQAhDI4CsHdAhQ7lFE8ILVszifIjVDQcmOKiWVuGIt+u cIfBCO8X6071CJxirulsojADu9S9qAqM8THteOTLeMJq6pd5HXASmlAVmEcAXe6slrE= X-Gm-Gg: ASbGncs87myyDRbSjoJ1iBD4JsYKRAXOhpdSyVB5oDIv9AkbeiZbcwhtLhAbZmoq20/ 3cvbO6QsvNeDkl2znX6IcLosLAocQYRAS6xXH9RZdQYgC1adp6/9UzlR4AD5QGacHObUIhZ5FiT kNds1ctwVpuTACbCXtvQ//7NiaFuJHSPvwHkihW10GB98T337smfDthwdFvZEx2GhWJSsTW+Kc8 0UZAdmd7IBNW4Z51SrkBeCE0XrWXsOXQFWHmPmjLoKOYkW9tMdp1Msp2Tg3G2/yKlgir9XnWnCx l077d7VPlNJXJUdv5PEXIE9s1ZS4nbwJ36maoTTPxYtvJT0ElFKVLZ0zK3Hbai0LmOml/Zv4aWh TBn/ZpMzGH9e0UH5RleMBptzkUDQAC2YJbhI4ttezFhfYdw== X-Google-Smtp-Source: AGHT+IGSzBQQGsbNRR3SZqd7vh9nZGoC7PUS1lh3+/p13pc6t1WziAuBTsyvJqOXqUW55QcL91DiiQ== X-Received: by 2002:a05:6a20:3d96:b0:2df:37cb:6b73 with SMTP id adf61e73a8af0-32da80bb9c4mr30115116637.11.1760428980002; Tue, 14 Oct 2025 01:03:00 -0700 (PDT) Received: from fedora ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33b626407c4sm14648210a91.6.2025.10.14.01.02.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 01:02:59 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: Jay Vosburgh , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Sabrina Dubroca , Jiri Pirko , Simon Horman , Ido Schimmel , Shuah Khan , Stanislav Fomichev , Stanislav Fomichev , Kuniyuki Iwashima , Ahmed Zaki , Alexander Lobakin , bridge@lists.linux.dev, linux-kselftest@vger.kernel.org, Hangbin Liu Subject: [PATCHv4 net-next 4/4] net: bridge: use common function to compute the features Date: Tue, 14 Oct 2025 08:02:17 +0000 Message-ID: <20251014080217.47988-5-liuhangbin@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251014080217.47988-1-liuhangbin@gmail.com> References: <20251014080217.47988-1-liuhangbin@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Previously, bridge ignored all features propagation and DST retention, only handling explicitly the GSO limits. By switching to the new helper netdev_compute_features_from_lowers(), the bridge now expose additional features, depending on the lowers capabilities. Since br_set_gso_limits() is already covered by the helper, it can be removed safely. Bridge has it's own way to update needed_headroom. So we don't need to update it in the helper. Signed-off-by: Hangbin Liu --- net/bridge/br_if.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 98c5b9c3145f..d614378245f8 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -525,20 +525,6 @@ void br_mtu_auto_adjust(struct net_bridge *br) br_opt_toggle(br, BROPT_MTU_SET_BY_USER, false); } -static void br_set_gso_limits(struct net_bridge *br) -{ - unsigned int tso_max_size = TSO_MAX_SIZE; - const struct net_bridge_port *p; - u16 tso_max_segs = TSO_MAX_SEGS; - - list_for_each_entry(p, &br->port_list, list) { - tso_max_size = min(tso_max_size, p->dev->tso_max_size); - tso_max_segs = min(tso_max_segs, p->dev->tso_max_segs); - } - netif_set_tso_max_size(br->dev, tso_max_size); - netif_set_tso_max_segs(br->dev, tso_max_segs); -} - /* * Recomputes features using slave's features */ @@ -652,8 +638,6 @@ int br_add_if(struct net_bridge *br, struct net_device *dev, netdev_err(dev, "failed to sync bridge static fdb addresses to this port\n"); } - netdev_update_features(br->dev); - br_hr = br->dev->needed_headroom; dev_hr = netdev_get_fwd_headroom(dev); if (br_hr < dev_hr) @@ -694,7 +678,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev, call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev); br_mtu_auto_adjust(br); - br_set_gso_limits(br); + + netdev_compute_features_from_lowers(br->dev, false); kobject_uevent(&p->kobj, KOBJ_ADD); @@ -740,7 +725,6 @@ int br_del_if(struct net_bridge *br, struct net_device *dev) del_nbp(p); br_mtu_auto_adjust(br); - br_set_gso_limits(br); spin_lock_bh(&br->lock); changed_addr = br_stp_recalculate_bridge_id(br); @@ -749,7 +733,7 @@ int br_del_if(struct net_bridge *br, struct net_device *dev) if (changed_addr) call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev); - netdev_update_features(br->dev); + netdev_compute_features_from_lowers(br->dev, false); return 0; } -- 2.50.1