lkml.org 
[lkml]   [2011]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[002/107] net: fix ETHTOOL_SFEATURES compatibility with old ethtool_ops.set_flags
    2.6.39-stable review patch.  If anyone has any objections, please let us know.

    ------------------


    From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <mirq-linux@rere.qmqm.pl>

    [ Upstream commit fd0daf9d58f6b3342d07c5f6bbfb304dbe5db4ec ]

    Current code squashes flags to bool - this makes set_flags fail whenever
    some ETH_FLAG_* equivalent features are set. Fix this.

    Signed-off-by: Micha©© Miros©©aw <mirq-linux@rere.qmqm.pl>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    net/core/ethtool.c | 25 ++++++++++++++++++++++++-
    1 file changed, 24 insertions(+), 1 deletion(-)

    --- a/net/core/ethtool.c
    +++ b/net/core/ethtool.c
    @@ -231,6 +231,29 @@ static int ethtool_set_feature_compat(st
    return 1;
    }

    +static int ethtool_set_flags_compat(struct net_device *dev,
    + int (*legacy_set)(struct net_device *, u32),
    + struct ethtool_set_features_block *features, u32 mask)
    +{
    + u32 value;
    +
    + if (!legacy_set)
    + return 0;
    +
    + if (!(features[0].valid & mask))
    + return 0;
    +
    + value = dev->features & ~features[0].valid;
    + value |= features[0].requested;
    +
    + features[0].valid &= ~mask;
    +
    + if (legacy_set(dev, value & mask) < 0)
    + netdev_info(dev, "Legacy flags change failed\n");
    +
    + return 1;
    +}
    +
    static int ethtool_set_features_compat(struct net_device *dev,
    struct ethtool_set_features_block *features)
    {
    @@ -247,7 +270,7 @@ static int ethtool_set_features_compat(s
    features, NETIF_F_ALL_TSO);
    compat |= ethtool_set_feature_compat(dev, dev->ethtool_ops->set_rx_csum,
    features, NETIF_F_RXCSUM);
    - compat |= ethtool_set_feature_compat(dev, dev->ethtool_ops->set_flags,
    + compat |= ethtool_set_flags_compat(dev, dev->ethtool_ops->set_flags,
    features, flags_dup_features);

    return compat;

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-07-08 07:03    [W:0.027 / U:59.208 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site