From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5665CC433ED for ; Thu, 22 Apr 2021 18:20:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1C70361422 for ; Thu, 22 Apr 2021 18:20:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236960AbhDVSV0 (ORCPT ); Thu, 22 Apr 2021 14:21:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236287AbhDVSVW (ORCPT ); Thu, 22 Apr 2021 14:21:22 -0400 Received: from mail-oi1-x229.google.com (mail-oi1-x229.google.com [IPv6:2607:f8b0:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62099C061756 for ; Thu, 22 Apr 2021 11:20:47 -0700 (PDT) Received: by mail-oi1-x229.google.com with SMTP id n184so20692219oia.12 for ; Thu, 22 Apr 2021 11:20:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4P/Z0BjOeHd7Em2QyQWG2wZNocvEtZNBkiauwY2SGp4=; b=T2QemxN7ttWSae0PyiMiwtcUsKIi+8bf2p2e6clu7ex0nD0XDo38eaQv5SjyJB4arN cucbglVUchz/JTtFxienPnQ52W/KVEjL6yXRHfV/+Je1s/Te32ZGD9LHLuGQolhSoqgk iJZ/SzO7lUTHtRbzzP7HLmnUwcmLAv4Gya+G0Pxws88KUP9Mg2h7RNTDdZd6TvSZS0bh dXYjqaXnxAP2u2shvNG/jy0Uz8jgw7WbFJh9N5pg5PQn4qACG5MLRTvsNP8CMsTVtmcQ sGnWPittx31cy6pwqiA4hmzJRexjQ9cCEChc3BqVRG9zrxQEc9jxJJVTEgknpLLL7rVx bRGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4P/Z0BjOeHd7Em2QyQWG2wZNocvEtZNBkiauwY2SGp4=; b=dEjAFXwl4K5t5lZLlsmYHhWiUHwE31f0/UUmFTsPXwpvkQqcbb0t96l3nDsvnoSce9 Asl6/cfiZJhMu9Qhkyx65O7S4Jx2mrP41H3S27oSILb7J6PvgozdCUqe14LFSQEW+chd vEx8UAhJbsOT0w0vnCMhWscI34r9DEUjxjRmu+tXH8cyL8tLHZYf7XC6B5CTWZJHwPI8 Q8z+j2o1HpcNZCRjlFNLCqGadeDcks5Pcyy9FE1/XksiCzucRcmVOCn2s3SH9hcQJutZ qXrKcpEp4Z6aBuyeYpHbJv/L5/jOSWUZHeDabJ7p8qnadeGr0/OhHv/4q3cnShKS92i1 fiUw== X-Gm-Message-State: AOAM532m+jts/tEOJlkL9p272aKqxCZjy/U/sXWFW27IrxLzV2kERYMH mPiPIvtahAwZ5tsnGW8ClP2ouA== X-Google-Smtp-Source: ABdhPJzPhX+RWy30+3QBAcSYLkNC4Tmz7iBG3p4iT3Vvj67kV0JmcwCrTHM35hpXY+gHe0FGNZDhkA== X-Received: by 2002:aca:fdc7:: with SMTP id b190mr3175938oii.14.1619115646623; Thu, 22 Apr 2021 11:20:46 -0700 (PDT) Received: from builder.lan (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id r9sm711634ool.3.2021.04.22.11.20.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Apr 2021 11:20:46 -0700 (PDT) From: Bjorn Andersson To: Subash Abhinov Kasiviswanathan , Sean Tranchetti , "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Daniele Palmas , Alex Elder , Aleksander Morgado , Loic Poulain Subject: [PATCH] net: qualcomm: rmnet: Allow partial updates of IFLA_FLAGS Date: Thu, 22 Apr 2021 13:20:45 -0500 Message-Id: <20210422182045.1040966-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The idiomatic way to handle the changelink flags/mask pair seems to be allow partial updates of the driver's link flags. In contrast the rmnet driver masks the incoming flags and then use that as the new flags. Change the rmnet driver to follow the common scheme, before the introduction of IFLA_RMNET_FLAGS handling in iproute2 et al. Signed-off-by: Bjorn Andersson --- drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c index 8d51b0cb545c..2c8db2fcc53d 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c @@ -336,7 +336,8 @@ static int rmnet_changelink(struct net_device *dev, struct nlattr *tb[], old_data_format = port->data_format; flags = nla_data(data[IFLA_RMNET_FLAGS]); - port->data_format = flags->flags & flags->mask; + port->data_format &= ~flags->mask; + port->data_format |= flags->flags & flags->mask; if (rmnet_vnd_update_dev_mtu(port, real_dev)) { port->data_format = old_data_format; -- 2.31.0