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/qlogic/qlcnic | |
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/qlogic/qlcnic')
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 5 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 9 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h index 7ed53dbb8646..60976fc4ccc6 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | |||
@@ -1466,8 +1466,9 @@ void qlcnic_advert_link_change(struct qlcnic_adapter *adapter, int linkup); | |||
1466 | 1466 | ||
1467 | int qlcnic_fw_cmd_set_mtu(struct qlcnic_adapter *adapter, int mtu); | 1467 | int qlcnic_fw_cmd_set_mtu(struct qlcnic_adapter *adapter, int mtu); |
1468 | int qlcnic_change_mtu(struct net_device *netdev, int new_mtu); | 1468 | int qlcnic_change_mtu(struct net_device *netdev, int new_mtu); |
1469 | u32 qlcnic_fix_features(struct net_device *netdev, u32 features); | 1469 | netdev_features_t qlcnic_fix_features(struct net_device *netdev, |
1470 | int qlcnic_set_features(struct net_device *netdev, u32 features); | 1470 | netdev_features_t features); |
1471 | int qlcnic_set_features(struct net_device *netdev, netdev_features_t features); | ||
1471 | int qlcnic_config_hw_lro(struct qlcnic_adapter *adapter, int enable); | 1472 | int qlcnic_config_hw_lro(struct qlcnic_adapter *adapter, int enable); |
1472 | int qlcnic_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable); | 1473 | int qlcnic_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable); |
1473 | int qlcnic_send_lro_cleanup(struct qlcnic_adapter *adapter); | 1474 | int qlcnic_send_lro_cleanup(struct qlcnic_adapter *adapter); |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c index bcb81e47543a..b528e52a8ee1 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | |||
@@ -817,12 +817,13 @@ int qlcnic_change_mtu(struct net_device *netdev, int mtu) | |||
817 | } | 817 | } |
818 | 818 | ||
819 | 819 | ||
820 | u32 qlcnic_fix_features(struct net_device *netdev, u32 features) | 820 | netdev_features_t qlcnic_fix_features(struct net_device *netdev, |
821 | netdev_features_t features) | ||
821 | { | 822 | { |
822 | struct qlcnic_adapter *adapter = netdev_priv(netdev); | 823 | struct qlcnic_adapter *adapter = netdev_priv(netdev); |
823 | 824 | ||
824 | if ((adapter->flags & QLCNIC_ESWITCH_ENABLED)) { | 825 | if ((adapter->flags & QLCNIC_ESWITCH_ENABLED)) { |
825 | u32 changed = features ^ netdev->features; | 826 | netdev_features_t changed = features ^ netdev->features; |
826 | features ^= changed & (NETIF_F_ALL_CSUM | NETIF_F_RXCSUM); | 827 | features ^= changed & (NETIF_F_ALL_CSUM | NETIF_F_RXCSUM); |
827 | } | 828 | } |
828 | 829 | ||
@@ -833,10 +834,10 @@ u32 qlcnic_fix_features(struct net_device *netdev, u32 features) | |||
833 | } | 834 | } |
834 | 835 | ||
835 | 836 | ||
836 | int qlcnic_set_features(struct net_device *netdev, u32 features) | 837 | int qlcnic_set_features(struct net_device *netdev, netdev_features_t features) |
837 | { | 838 | { |
838 | struct qlcnic_adapter *adapter = netdev_priv(netdev); | 839 | struct qlcnic_adapter *adapter = netdev_priv(netdev); |
839 | u32 changed = netdev->features ^ features; | 840 | netdev_features_t changed = netdev->features ^ features; |
840 | int hw_lro = (features & NETIF_F_LRO) ? QLCNIC_LRO_ENABLED : 0; | 841 | int hw_lro = (features & NETIF_F_LRO) ? QLCNIC_LRO_ENABLED : 0; |
841 | 842 | ||
842 | if (!(changed & NETIF_F_LRO)) | 843 | if (!(changed & NETIF_F_LRO)) |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 0bd163828e33..823f845ddc04 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |||
@@ -792,7 +792,7 @@ qlcnic_set_netdev_features(struct qlcnic_adapter *adapter, | |||
792 | struct qlcnic_esw_func_cfg *esw_cfg) | 792 | struct qlcnic_esw_func_cfg *esw_cfg) |
793 | { | 793 | { |
794 | struct net_device *netdev = adapter->netdev; | 794 | struct net_device *netdev = adapter->netdev; |
795 | unsigned long features, vlan_features; | 795 | netdev_features_t features, vlan_features; |
796 | 796 | ||
797 | features = (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM | | 797 | features = (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM | |
798 | NETIF_F_IPV6_CSUM | NETIF_F_GRO); | 798 | NETIF_F_IPV6_CSUM | NETIF_F_GRO); |