|
@@ -1589,7 +1589,7 @@ static const struct ethtool_ops nes_ethtool_ops = {
|
|
.set_pauseparam = nes_netdev_set_pauseparam,
|
|
.set_pauseparam = nes_netdev_set_pauseparam,
|
|
};
|
|
};
|
|
|
|
|
|
-static void nes_vlan_mode(struct net_device *netdev, struct nes_device *nesdev, u32 features)
|
|
|
|
|
|
+static void nes_vlan_mode(struct net_device *netdev, struct nes_device *nesdev, netdev_features_t features)
|
|
{
|
|
{
|
|
struct nes_adapter *nesadapter = nesdev->nesadapter;
|
|
struct nes_adapter *nesadapter = nesdev->nesadapter;
|
|
u32 u32temp;
|
|
u32 u32temp;
|
|
@@ -1610,7 +1610,7 @@ static void nes_vlan_mode(struct net_device *netdev, struct nes_device *nesdev,
|
|
spin_unlock_irqrestore(&nesadapter->phy_lock, flags);
|
|
spin_unlock_irqrestore(&nesadapter->phy_lock, flags);
|
|
}
|
|
}
|
|
|
|
|
|
-static u32 nes_fix_features(struct net_device *netdev, u32 features)
|
|
|
|
|
|
+static netdev_features_t nes_fix_features(struct net_device *netdev, netdev_features_t features)
|
|
{
|
|
{
|
|
/*
|
|
/*
|
|
* Since there is no support for separate rx/tx vlan accel
|
|
* 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)
|
|
return features;
|
|
return features;
|
|
}
|
|
}
|
|
|
|
|
|
-static int nes_set_features(struct net_device *netdev, u32 features)
|
|
|
|
|
|
+static int nes_set_features(struct net_device *netdev, netdev_features_t features)
|
|
{
|
|
{
|
|
struct nes_vnic *nesvnic = netdev_priv(netdev);
|
|
struct nes_vnic *nesvnic = netdev_priv(netdev);
|
|
struct nes_device *nesdev = nesvnic->nesdev;
|
|
struct nes_device *nesdev = nesvnic->nesdev;
|