Commit 9ca36f7d authored by David S. Miller's avatar David S. Miller
Browse files

infiniband: Update net drivers for netdev_features_t changes. 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 34324dc2

drivers/infiniband/hw/nes/nes_nic.c

+3 −3
Original line number Diff line number Diff line
@@ -1589,7 +1589,7 @@ static const struct ethtool_ops nes_ethtool_ops = { 
	.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;

	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);

}



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
@@ -1624,7 +1624,7 @@ static u32 nes_fix_features(struct net_device *netdev, u32 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_device *nesdev = nesvnic->nesdev;

drivers/infiniband/ulp/ipoib/ipoib_main.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int ipoib_stop(struct net_device *dev) 
	return 0;

}



static u32 ipoib_fix_features(struct net_device *dev, u32 features)

static netdev_features_t ipoib_fix_features(struct net_device *dev, netdev_features_t features)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);