aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_device.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/bridge/br_device.c')
-rw-r--r--net/bridge/br_device.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index feb77ea7b58e..a3754ac262c3 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -186,7 +186,8 @@ static void br_getinfo(struct net_device *dev, struct ethtool_drvinfo *info)
186 strcpy(info->bus_info, "N/A"); 186 strcpy(info->bus_info, "N/A");
187} 187}
188 188
189static u32 br_fix_features(struct net_device *dev, u32 features) 189static netdev_features_t br_fix_features(struct net_device *dev,
190 netdev_features_t features)
190{ 191{
191 struct net_bridge *br = netdev_priv(dev); 192 struct net_bridge *br = netdev_priv(dev);
192 193
@@ -341,10 +342,10 @@ void br_dev_setup(struct net_device *dev)
341 dev->priv_flags = IFF_EBRIDGE; 342 dev->priv_flags = IFF_EBRIDGE;
342 343
343 dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA | 344 dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |
344 NETIF_F_GSO_MASK | NETIF_F_NO_CSUM | NETIF_F_LLTX | 345 NETIF_F_GSO_MASK | NETIF_F_HW_CSUM | NETIF_F_LLTX |
345 NETIF_F_NETNS_LOCAL | NETIF_F_HW_VLAN_TX; 346 NETIF_F_NETNS_LOCAL | NETIF_F_HW_VLAN_TX;
346 dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA | 347 dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |
347 NETIF_F_GSO_MASK | NETIF_F_NO_CSUM | 348 NETIF_F_GSO_MASK | NETIF_F_HW_CSUM |
348 NETIF_F_HW_VLAN_TX; 349 NETIF_F_HW_VLAN_TX;
349 350
350 br->dev = dev; 351 br->dev = dev;