aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-11-16 18:05:50 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-16 18:05:50 -0500
commit9ca36f7db29a1e4bde58fa7cf98b542c032b7180 (patch)
tree6fbdb669e9c4c66afc55425063984a5079820671 /drivers/infiniband
parent34324dc2bf27c1773045fea63cb11f7e2a6ad2b9 (diff)
infiniband: Update net drivers for netdev_features_t changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/nes/nes_nic.c6
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_main.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index c00d2f3f8966..4b3fa711a247 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1589,7 +1589,7 @@ static const struct ethtool_ops nes_ethtool_ops = {
1589 .set_pauseparam = nes_netdev_set_pauseparam, 1589 .set_pauseparam = nes_netdev_set_pauseparam,
1590}; 1590};
1591 1591
1592static void nes_vlan_mode(struct net_device *netdev, struct nes_device *nesdev, u32 features) 1592static void nes_vlan_mode(struct net_device *netdev, struct nes_device *nesdev, netdev_features_t features)
1593{ 1593{
1594 struct nes_adapter *nesadapter = nesdev->nesadapter; 1594 struct nes_adapter *nesadapter = nesdev->nesadapter;
1595 u32 u32temp; 1595 u32 u32temp;
@@ -1610,7 +1610,7 @@ static void nes_vlan_mode(struct net_device *netdev, struct nes_device *nesdev,
1610 spin_unlock_irqrestore(&nesadapter->phy_lock, flags); 1610 spin_unlock_irqrestore(&nesadapter->phy_lock, flags);
1611} 1611}
1612 1612
1613static u32 nes_fix_features(struct net_device *netdev, u32 features) 1613static netdev_features_t nes_fix_features(struct net_device *netdev, netdev_features_t features)
1614{ 1614{
1615 /* 1615 /*
1616 * Since there is no support for separate rx/tx vlan accel 1616 * Since there is no support for separate rx/tx vlan accel
@@ -1624,7 +1624,7 @@ static u32 nes_fix_features(struct net_device *netdev, u32 features)
1624 return features; 1624 return features;
1625} 1625}
1626 1626
1627static int nes_set_features(struct net_device *netdev, u32 features) 1627static int nes_set_features(struct net_device *netdev, netdev_features_t features)
1628{ 1628{
1629 struct nes_vnic *nesvnic = netdev_priv(netdev); 1629 struct nes_vnic *nesvnic = netdev_priv(netdev);
1630 struct nes_device *nesdev = nesvnic->nesdev; 1630 struct nes_device *nesdev = nesvnic->nesdev;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 7567b6000230..efd7a9636aff 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -171,7 +171,7 @@ static int ipoib_stop(struct net_device *dev)
171 return 0; 171 return 0;
172} 172}
173 173
174static u32 ipoib_fix_features(struct net_device *dev, u32 features) 174static netdev_features_t ipoib_fix_features(struct net_device *dev, netdev_features_t features)
175{ 175{
176 struct ipoib_dev_priv *priv = netdev_priv(dev); 176 struct ipoib_dev_priv *priv = netdev_priv(dev);
177 177