| Message ID | 20140919104025.GA26391@mwanda |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Dan Carpenter [mailto:dan.carpenter@oracle.com] > Sent: Friday, September 19, 2014 6:40 PM [...] > There is an extra semi-colon so __rtl8169_set_features() is > called every > time. Acked-by: Hayes Wang <hayeswang@realtek.com>-- 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
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Fri, 19 Sep 2014 13:40:25 +0300 > There is an extra semi-colon so __rtl8169_set_features() is called every > time. > > Fixes: 929a031dfd62 ('r8169: adjust __rtl8169_set_features') > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Dan, this bug exists in 'net' so that is what you should have targetted this tree at. Applied, thanks. -- 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/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 3027f4a..1d81238 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1882,7 +1882,7 @@ static int rtl8169_set_features(struct net_device *dev, features &= NETIF_F_RXALL | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_RX; rtl_lock_work(tp); - if (features ^ dev->features); + if (features ^ dev->features) __rtl8169_set_features(dev, features); rtl_unlock_work(tp);
There is an extra semi-colon so __rtl8169_set_features() is called every time. Fixes: 929a031dfd62 ('r8169: adjust __rtl8169_set_features') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -- 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