| Message ID | 20110517081954.A227013A6A@rere.qmqm.pl |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, May 17, 2011 at 10:19:54AM +0200, Michał Mirosław wrote: > tun->set_features are meant to limit not force the features. > > Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Not sure when I'll find the time to test this but just looking at the code, the patch makes sense to me. So: Acked-by: Michael S. Tsirkin <mst@redhat.com> We probably want this in -stable too? > --- > 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 74e9405..f77c6d0 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); > } > > static const struct net_device_ops tun_netdev_ops = { > -- > 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 74e9405..f77c6d0 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); } static const struct net_device_ops tun_netdev_ops = {
tun->set_features are meant to limit not force the features. Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> --- drivers/net/tun.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)