From: roopa <roopa@cumulusnetworks•com>
To: "Arad, Ronen" <ronen.arad@intel•com>
Cc: "Rosen, Rami" <rami.rosen@intel•com>,
"davem@davemloft•net" <davem@davemloft•net>,
"netdev@vger•kernel.org" <netdev@vger•kernel.org>
Subject: Re: [PATCH net-next] bridge: Fix setting a flag in br_fill_ifvlaninfo_range().
Date: Fri, 15 May 2015 12:11:00 -0700 [thread overview]
Message-ID: <555644C4.8000401@cumulusnetworks.com> (raw)
In-Reply-To: <E4CD12F19ABA0C4D8729E087A761DC35068365EC@ORSMSX101.amr.corp.intel.com>
On 5/15/15, 11:45 AM, Arad, Ronen wrote:
>
>> -----Original Message-----
>> From: Rosen, Rami
>> Sent: Friday, May 15, 2015 7:27 AM
>> To: davem@davemloft•net
>> Cc: netdev@vger•kernel.org; roopa@cumulusnetworks•com; Arad, Ronen; Rosen,
>> Rami
>> Subject: [PATCH net-next] bridge: Fix setting a flag in
>> br_fill_ifvlaninfo_range().
>>
>> This patch fixes setting of vinfo.flags in the br_fill_ifvlaninfo_range(). The
>> assignment of vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN has no effect
>> without
>> this patch, as vinfo.flags value is overriden by the
>> vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_END assignement, which follows
>> it immedialtely.
>>
>> Signed-off-by: Rami Rosen <rami.rosen@intel•com>
>> ---
>> net/bridge/br_netlink.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
>> index 6b67ed3..fec65bb 100644
>> --- a/net/bridge/br_netlink.c
>> +++ b/net/bridge/br_netlink.c
>> @@ -167,7 +167,7 @@ static int br_fill_ifvlaninfo_range(struct sk_buff *skb,
>> u16 vid_start,
>> vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN;
>>
>> vinfo.vid = vid_end;
>> - vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_END;
>> + vinfo.flags &= flags | BRIDGE_VLAN_INFO_RANGE_END;
>> if (nla_put(skb, IFLA_BRIDGE_VLAN_INFO,
>> sizeof(vinfo), &vinfo))
>> goto nla_put_failure;
>
> The first part of " &= flags " has no impact as it reverts vinfo.flags to
> just the bits set in the flags argument. This is exactly what
> "vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN" does.
>
> If original code was intended to indicate that the same flags are used for
> both start and end attributes except for the RANGE_BEGIN/RANGE_END flags
> it would be sufficient to keep the line that clears RANGE_BEGIN bit and
> OR vinfo.flags with RANGE_END for the end attribute:
>
> vinfo.flags |= BRIDGE_VLAN_INFO_RANGE_END;
>
> If we want the code to show what is actually been written into each
> attribute, the fix should be to just delete the line which clears
> RANGE_BEGIN flag.
I would prefer the fix to just delete the line that clears RANGE_BEGIN
because as you and this patch points out that it is a no-op.
>
> In either case the code as exists today is working as expected. A fix is
> only needed to improve readability.
agreed.
In any case Acked-by: Roopa Prabhu <roopa@cumulusnetworks•com>
thanks!
prev parent reply other threads:[~2015-05-15 19:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-15 14:27 [PATCH net-next] bridge: Fix setting a flag in br_fill_ifvlaninfo_range() Rami Rosen
2015-05-15 18:45 ` Arad, Ronen
2015-05-15 19:11 ` roopa [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=555644C4.8000401@cumulusnetworks.com \
--to=roopa@cumulusnetworks$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=rami.rosen@intel$(echo .)com \
--cc=ronen.arad@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox