diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-11-15 10:29:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-16 17:43:10 -0500 |
commit | c8f44affb7244f2ac3e703cab13d55ede27621bb (patch) | |
tree | 62e7aea2916a8d7cab825fe500670c5113854c0f /drivers/net/ethernet/nvidia | |
parent | a59e2ecb859f2ab03bb2e230709f8039472ad2c3 (diff) |
net: introduce and use netdev_features_t for device features sets
v2: add couple missing conversions in drivers
split unexporting netdev_fix_features()
implemented %pNF
convert sock::sk_route_(no?)caps
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/nvidia')
-rw-r--r-- | drivers/net/ethernet/nvidia/forcedeth.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index e8a5ae356407..01bb7bfe14e6 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c | |||
@@ -4536,7 +4536,7 @@ static int nv_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam* | |||
4536 | return 0; | 4536 | return 0; |
4537 | } | 4537 | } |
4538 | 4538 | ||
4539 | static int nv_set_loopback(struct net_device *dev, u32 features) | 4539 | static int nv_set_loopback(struct net_device *dev, netdev_features_t features) |
4540 | { | 4540 | { |
4541 | struct fe_priv *np = netdev_priv(dev); | 4541 | struct fe_priv *np = netdev_priv(dev); |
4542 | unsigned long flags; | 4542 | unsigned long flags; |
@@ -4591,7 +4591,8 @@ static int nv_set_loopback(struct net_device *dev, u32 features) | |||
4591 | return retval; | 4591 | return retval; |
4592 | } | 4592 | } |
4593 | 4593 | ||
4594 | static u32 nv_fix_features(struct net_device *dev, u32 features) | 4594 | static netdev_features_t nv_fix_features(struct net_device *dev, |
4595 | netdev_features_t features) | ||
4595 | { | 4596 | { |
4596 | /* vlan is dependent on rx checksum offload */ | 4597 | /* vlan is dependent on rx checksum offload */ |
4597 | if (features & (NETIF_F_HW_VLAN_TX|NETIF_F_HW_VLAN_RX)) | 4598 | if (features & (NETIF_F_HW_VLAN_TX|NETIF_F_HW_VLAN_RX)) |
@@ -4600,7 +4601,7 @@ static u32 nv_fix_features(struct net_device *dev, u32 features) | |||
4600 | return features; | 4601 | return features; |
4601 | } | 4602 | } |
4602 | 4603 | ||
4603 | static void nv_vlan_mode(struct net_device *dev, u32 features) | 4604 | static void nv_vlan_mode(struct net_device *dev, netdev_features_t features) |
4604 | { | 4605 | { |
4605 | struct fe_priv *np = get_nvpriv(dev); | 4606 | struct fe_priv *np = get_nvpriv(dev); |
4606 | 4607 | ||
@@ -4621,11 +4622,11 @@ static void nv_vlan_mode(struct net_device *dev, u32 features) | |||
4621 | spin_unlock_irq(&np->lock); | 4622 | spin_unlock_irq(&np->lock); |
4622 | } | 4623 | } |
4623 | 4624 | ||
4624 | static int nv_set_features(struct net_device *dev, u32 features) | 4625 | static int nv_set_features(struct net_device *dev, netdev_features_t features) |
4625 | { | 4626 | { |
4626 | struct fe_priv *np = netdev_priv(dev); | 4627 | struct fe_priv *np = netdev_priv(dev); |
4627 | u8 __iomem *base = get_hwbase(dev); | 4628 | u8 __iomem *base = get_hwbase(dev); |
4628 | u32 changed = dev->features ^ features; | 4629 | netdev_features_t changed = dev->features ^ features; |
4629 | int retval; | 4630 | int retval; |
4630 | 4631 | ||
4631 | if ((changed & NETIF_F_LOOPBACK) && netif_running(dev)) { | 4632 | if ((changed & NETIF_F_LOOPBACK) && netif_running(dev)) { |