diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-11-15 10:29:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-16 17:43:10 -0500 |
commit | c8f44affb7244f2ac3e703cab13d55ede27621bb (patch) | |
tree | 62e7aea2916a8d7cab825fe500670c5113854c0f /drivers/net/ethernet/intel/igb/igb_main.c | |
parent | a59e2ecb859f2ab03bb2e230709f8039472ad2c3 (diff) |
net: introduce and use netdev_features_t for device features sets
v2: add couple missing conversions in drivers
split unexporting netdev_fix_features()
implemented %pNF
convert sock::sk_route_(no?)caps
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index ced544499f1b..1fcba22c6403 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
@@ -145,7 +145,7 @@ static bool igb_clean_rx_irq(struct igb_q_vector *, int); | |||
145 | static int igb_ioctl(struct net_device *, struct ifreq *, int cmd); | 145 | static int igb_ioctl(struct net_device *, struct ifreq *, int cmd); |
146 | static void igb_tx_timeout(struct net_device *); | 146 | static void igb_tx_timeout(struct net_device *); |
147 | static void igb_reset_task(struct work_struct *); | 147 | static void igb_reset_task(struct work_struct *); |
148 | static void igb_vlan_mode(struct net_device *netdev, u32 features); | 148 | static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features); |
149 | static void igb_vlan_rx_add_vid(struct net_device *, u16); | 149 | static void igb_vlan_rx_add_vid(struct net_device *, u16); |
150 | static void igb_vlan_rx_kill_vid(struct net_device *, u16); | 150 | static void igb_vlan_rx_kill_vid(struct net_device *, u16); |
151 | static void igb_restore_vlan(struct igb_adapter *); | 151 | static void igb_restore_vlan(struct igb_adapter *); |
@@ -1742,7 +1742,8 @@ void igb_reset(struct igb_adapter *adapter) | |||
1742 | igb_get_phy_info(hw); | 1742 | igb_get_phy_info(hw); |
1743 | } | 1743 | } |
1744 | 1744 | ||
1745 | static u32 igb_fix_features(struct net_device *netdev, u32 features) | 1745 | static netdev_features_t igb_fix_features(struct net_device *netdev, |
1746 | netdev_features_t features) | ||
1746 | { | 1747 | { |
1747 | /* | 1748 | /* |
1748 | * Since there is no support for separate rx/tx vlan accel | 1749 | * Since there is no support for separate rx/tx vlan accel |
@@ -1756,9 +1757,10 @@ static u32 igb_fix_features(struct net_device *netdev, u32 features) | |||
1756 | return features; | 1757 | return features; |
1757 | } | 1758 | } |
1758 | 1759 | ||
1759 | static int igb_set_features(struct net_device *netdev, u32 features) | 1760 | static int igb_set_features(struct net_device *netdev, |
1761 | netdev_features_t features) | ||
1760 | { | 1762 | { |
1761 | u32 changed = netdev->features ^ features; | 1763 | netdev_features_t changed = netdev->features ^ features; |
1762 | 1764 | ||
1763 | if (changed & NETIF_F_HW_VLAN_RX) | 1765 | if (changed & NETIF_F_HW_VLAN_RX) |
1764 | igb_vlan_mode(netdev, features); | 1766 | igb_vlan_mode(netdev, features); |
@@ -6467,7 +6469,7 @@ s32 igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value) | |||
6467 | return 0; | 6469 | return 0; |
6468 | } | 6470 | } |
6469 | 6471 | ||
6470 | static void igb_vlan_mode(struct net_device *netdev, u32 features) | 6472 | static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features) |
6471 | { | 6473 | { |
6472 | struct igb_adapter *adapter = netdev_priv(netdev); | 6474 | struct igb_adapter *adapter = netdev_priv(netdev); |
6473 | struct e1000_hw *hw = &adapter->hw; | 6475 | struct e1000_hw *hw = &adapter->hw; |