From d9d086d36eb18765e067638e6a6e5fbcbbae2d54 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 31 Oct 2025 07:58:56 +0000 Subject: [PATCH] Revert "net: rtnetlink: remove redundant assignment to variable err" This reverts commit c49d31809af2472131640f0e3429f621fe91360c which is commit 7d3118016787b5c05da94b3bcdb96c9d6ff82c44 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I29e9d676be00412288460401a10b4c456aa90f99 Signed-off-by: Greg Kroah-Hartman --- net/core/rtnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index f1338734c2ee..2b7ad5cf8fbf 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3823,8 +3823,8 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh, struct ndmsg *ndm; struct nlattr *tb[NDA_MAX+1]; struct net_device *dev; + int err = -EINVAL; __u8 *addr; - int err; u16 vid; if (!netlink_capable(skb, CAP_NET_ADMIN))