diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2013-04-25 10:44:20 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-04-25 03:50:17 -0400 |
| commit | cf62cb72d63944f4dcc7376efd84959afc9366cb (patch) | |
| tree | 34872c22d8e9e3ea6f266333e59fc1add8c0ee63 /drivers/net/ethernet/calxeda/xgmac.c | |
| parent | openvswitch: Use parallel_ops genl. (diff) | |
| download | linux-dev-cf62cb72d63944f4dcc7376efd84959afc9366cb.tar.xz linux-dev-cf62cb72d63944f4dcc7376efd84959afc9366cb.zip | |
net: calxedaxgmac: fix condition in xgmac_set_features()
The "changed" variable should be a 64 bit type, otherwise it can't store
all the features. The way the code is now the test for whether
NETIF_F_RXCSUM changed is always false and we return immediately.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/calxeda/xgmac.c')
| -rw-r--r-- | drivers/net/ethernet/calxeda/xgmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c index 791e5ff305d8..4a1f2fa812ab 100644 --- a/drivers/net/ethernet/calxeda/xgmac.c +++ b/drivers/net/ethernet/calxeda/xgmac.c @@ -1482,7 +1482,7 @@ static int xgmac_set_features(struct net_device *dev, netdev_features_t features u32 ctrl; struct xgmac_priv *priv = netdev_priv(dev); void __iomem *ioaddr = priv->base; - u32 changed = dev->features ^ features; + netdev_features_t changed = dev->features ^ features; if (!(changed & NETIF_F_RXCSUM)) return 0; |