aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/chelsio/cxgb4vf
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4vf')
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index ee81d8e798ea..8155cfecae19 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -1092,7 +1092,8 @@ static int cxgb4vf_change_mtu(struct net_device *dev, int new_mtu)
1092 return ret; 1092 return ret;
1093} 1093}
1094 1094
1095static u32 cxgb4vf_fix_features(struct net_device *dev, u32 features) 1095static netdev_features_t cxgb4vf_fix_features(struct net_device *dev,
1096 netdev_features_t features)
1096{ 1097{
1097 /* 1098 /*
1098 * Since there is no support for separate rx/tx vlan accel 1099 * Since there is no support for separate rx/tx vlan accel
@@ -1106,10 +1107,11 @@ static u32 cxgb4vf_fix_features(struct net_device *dev, u32 features)
1106 return features; 1107 return features;
1107} 1108}
1108 1109
1109static int cxgb4vf_set_features(struct net_device *dev, u32 features) 1110static int cxgb4vf_set_features(struct net_device *dev,
1111 netdev_features_t features)
1110{ 1112{
1111 struct port_info *pi = netdev_priv(dev); 1113 struct port_info *pi = netdev_priv(dev);
1112 u32 changed = dev->features ^ features; 1114 netdev_features_t changed = dev->features ^ features;
1113 1115
1114 if (changed & NETIF_F_HW_VLAN_RX) 1116 if (changed & NETIF_F_HW_VLAN_RX)
1115 t4vf_set_rxmode(pi->adapter, pi->viid, -1, -1, -1, -1, 1117 t4vf_set_rxmode(pi->adapter, pi->viid, -1, -1, -1, -1,