[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20110620194456.GA3231@rere.qmqm.pl>
Date: Mon, 20 Jun 2011 21:44:56 +0200
From: Michał Mirosław <mirq-linux@...e.qmqm.pl>
To: Ben Hutchings <bhutchings@...arflare.com>
Cc: netdev@...r.kernel.org, Herbert Xu <herbert@...dor.apana.org.au>,
"Michael S. Tsirkin" <mst@...hat.com>,
Shan Wei <shanwei@...fujitsu.com>
Subject: Re: [RESENT PATCH] net: tuntap: Fix tun_net_fix_features()
On Mon, Jun 20, 2011 at 08:25:06PM +0100, Ben Hutchings wrote:
> On Mon, 2011-06-20 at 21:14 +0200, Michał Mirosław wrote:
> > tun->set_features are meant to limit not force the features.
> >
> > Signed-off-by: Michał Mirosław <mirq-linux@...e.qmqm.pl>
> > Acked-by: Michael S. Tsirkin <mst@...hat.com>
> >
> > ---
> > drivers/net/tun.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/net/tun.c b/drivers/net/tun.c
> > index 4dab85e..56981c2 100644
> > --- a/drivers/net/tun.c
> > +++ b/drivers/net/tun.c
> > @@ -458,7 +458,7 @@ static u32 tun_net_fix_features(struct net_device *dev, u32 features)
> > {
> > struct tun_struct *tun = netdev_priv(dev);
> >
> > - return (features & tun->set_features) | (features & ~TUN_USER_FEATURES);
> > + return features & (tun->set_features | ~TUN_USER_FEATURES);
>
> (A & B) | (A & C) <=> A & (B | C)
>
> This is a cosmetic change, not a fix. Maybe you think it is clearer but
> then you should say that in the commit message.
Hmm. Noise through my braincells, I suppose. Let's just drop this patch.
Best Regards,
Michał Mirosław
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists