diff options
Diffstat (limited to 'drivers/net/ethernet/atheros/atl1c/atl1c_main.c')
-rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 02c7ed8d9eca..b8591246eb4c 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c | |||
@@ -411,7 +411,7 @@ static void atl1c_set_multi(struct net_device *netdev) | |||
411 | } | 411 | } |
412 | } | 412 | } |
413 | 413 | ||
414 | static void __atl1c_vlan_mode(u32 features, u32 *mac_ctrl_data) | 414 | static void __atl1c_vlan_mode(netdev_features_t features, u32 *mac_ctrl_data) |
415 | { | 415 | { |
416 | if (features & NETIF_F_HW_VLAN_RX) { | 416 | if (features & NETIF_F_HW_VLAN_RX) { |
417 | /* enable VLAN tag insert/strip */ | 417 | /* enable VLAN tag insert/strip */ |
@@ -422,7 +422,8 @@ static void __atl1c_vlan_mode(u32 features, u32 *mac_ctrl_data) | |||
422 | } | 422 | } |
423 | } | 423 | } |
424 | 424 | ||
425 | static void atl1c_vlan_mode(struct net_device *netdev, u32 features) | 425 | static void atl1c_vlan_mode(struct net_device *netdev, |
426 | netdev_features_t features) | ||
426 | { | 427 | { |
427 | struct atl1c_adapter *adapter = netdev_priv(netdev); | 428 | struct atl1c_adapter *adapter = netdev_priv(netdev); |
428 | struct pci_dev *pdev = adapter->pdev; | 429 | struct pci_dev *pdev = adapter->pdev; |
@@ -482,7 +483,8 @@ static void atl1c_set_rxbufsize(struct atl1c_adapter *adapter, | |||
482 | roundup(mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN, 8) : AT_RX_BUF_SIZE; | 483 | roundup(mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN, 8) : AT_RX_BUF_SIZE; |
483 | } | 484 | } |
484 | 485 | ||
485 | static u32 atl1c_fix_features(struct net_device *netdev, u32 features) | 486 | static netdev_features_t atl1c_fix_features(struct net_device *netdev, |
487 | netdev_features_t features) | ||
486 | { | 488 | { |
487 | /* | 489 | /* |
488 | * Since there is no support for separate rx/tx vlan accel | 490 | * Since there is no support for separate rx/tx vlan accel |
@@ -499,9 +501,10 @@ static u32 atl1c_fix_features(struct net_device *netdev, u32 features) | |||
499 | return features; | 501 | return features; |
500 | } | 502 | } |
501 | 503 | ||
502 | static int atl1c_set_features(struct net_device *netdev, u32 features) | 504 | static int atl1c_set_features(struct net_device *netdev, |
505 | netdev_features_t features) | ||
503 | { | 506 | { |
504 | u32 changed = netdev->features ^ features; | 507 | netdev_features_t changed = netdev->features ^ features; |
505 | 508 | ||
506 | if (changed & NETIF_F_HW_VLAN_RX) | 509 | if (changed & NETIF_F_HW_VLAN_RX) |
507 | atl1c_vlan_mode(netdev, features); | 510 | atl1c_vlan_mode(netdev, features); |