From 557a77816eaede9ae238d156b610998e50e318c7 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Fri, 26 Feb 2010 21:43:38 +0000 Subject: [PATCH] --- yaml --- r: 184589 b: refs/heads/master c: 9675478bbafed08848bf8d7e28400d5e46330b23 h: refs/heads/master i: 184587: 6a11aad8f8bfd7b4d7b3805ab40fb025dca464a3 v: v3 --- [refs] | 2 +- trunk/net/core/ethtool.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8022f343c2e4..3707654e2ef6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c74651c3bce418d3b29edfdeb72664f9441509a +refs/heads/master: 9675478bbafed08848bf8d7e28400d5e46330b23 diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c index 31b1eddc1b84..0f2f82185ec4 100644 --- a/trunk/net/core/ethtool.c +++ b/trunk/net/core/ethtool.c @@ -135,21 +135,23 @@ u32 ethtool_op_get_flags(struct net_device *dev) int ethtool_op_set_flags(struct net_device *dev, u32 data) { const struct ethtool_ops *ops = dev->ethtool_ops; + unsigned long features = dev->features; if (data & ETH_FLAG_LRO) - dev->features |= NETIF_F_LRO; + features |= NETIF_F_LRO; else - dev->features &= ~NETIF_F_LRO; + features &= ~NETIF_F_LRO; if (data & ETH_FLAG_NTUPLE) { if (!ops->set_rx_ntuple) return -EOPNOTSUPP; - dev->features |= NETIF_F_NTUPLE; + features |= NETIF_F_NTUPLE; } else { /* safe to clear regardless */ - dev->features &= ~NETIF_F_NTUPLE; + features &= ~NETIF_F_NTUPLE; } + dev->features = features; return 0; }