From ccac1f9c04403b1793d1f75cb40ee0ee3244dbe4 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 25 Apr 2013 10:44:20 +0300 Subject: [PATCH] --- yaml --- r: 369748 b: refs/heads/master c: cf62cb72d63944f4dcc7376efd84959afc9366cb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/calxeda/xgmac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 606d20a99ba5..4340747fc0dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a4e0d6a95b2b6f7b22eb7c7361a0fc4289478eb +refs/heads/master: cf62cb72d63944f4dcc7376efd84959afc9366cb diff --git a/trunk/drivers/net/ethernet/calxeda/xgmac.c b/trunk/drivers/net/ethernet/calxeda/xgmac.c index 791e5ff305d8..4a1f2fa812ab 100644 --- a/trunk/drivers/net/ethernet/calxeda/xgmac.c +++ b/trunk/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;