net: hns3: change flr_prepare/flr_done function names

[linux-2.6-microblaze.git] / drivers / net / ethernet / hisilicon / hns3 / hnae3.h

diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
index e9e60a9..1d21890 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
@@ -90,6 +90,7 @@ enum HNAE3_DEV_CAP_BITS {
        HNAE3_DEV_SUPPORT_HW_PAD_B,
        HNAE3_DEV_SUPPORT_STASH_B,
        HNAE3_DEV_SUPPORT_UDP_TUNNEL_CSUM_B,
+       HNAE3_DEV_SUPPORT_PAUSE_B,
 };
 
 #define hnae3_dev_fd_supported(hdev) \
@@ -134,6 +135,9 @@ enum HNAE3_DEV_CAP_BITS {
 #define hnae3_dev_stash_supported(hdev) \
        test_bit(HNAE3_DEV_SUPPORT_STASH_B, (hdev)->ae_dev->caps)
 
+#define hnae3_dev_pause_supported(hdev) \
+       test_bit(HNAE3_DEV_SUPPORT_PAUSE_B, (hdev)->ae_dev->caps)
+
 #define hnae3_ae_dev_tqp_txrx_indep_supported(ae_dev) \
        test_bit(HNAE3_DEV_SUPPORT_TQP_TXRX_INDEP_B, (ae_dev)->caps)
 
@@ -470,8 +474,9 @@ struct hnae3_ae_dev {
 struct hnae3_ae_ops {
        int (*init_ae_dev)(struct hnae3_ae_dev *ae_dev);
        void (*uninit_ae_dev)(struct hnae3_ae_dev *ae_dev);
-       void (*flr_prepare)(struct hnae3_ae_dev *ae_dev);
-       void (*flr_done)(struct hnae3_ae_dev *ae_dev);
+       void (*reset_prepare)(struct hnae3_ae_dev *ae_dev,
+                             enum hnae3_reset_type rst_type);
+       void (*reset_done)(struct hnae3_ae_dev *ae_dev);
        int (*init_client_instance)(struct hnae3_client *client,
                                    struct hnae3_ae_dev *ae_dev);
        void (*uninit_client_instance)(struct hnae3_client *client,
@@ -575,7 +580,7 @@ struct hnae3_ae_ops {
                                      int vector_num,
                                      struct hnae3_ring_chain_node *vr_chain);
 
-       int (*reset_queue)(struct hnae3_handle *handle, u16 queue_id);
+       int (*reset_queue)(struct hnae3_handle *handle);
        u32 (*get_fw_version)(struct hnae3_handle *handle);
        void (*get_mdix_mode)(struct hnae3_handle *handle,
                              u8 *tp_mdix_ctrl, u8 *tp_mdix);
@@ -608,8 +613,6 @@ struct hnae3_ae_ops {
                            struct ethtool_rxnfc *cmd);
        int (*del_fd_entry)(struct hnae3_handle *handle,
                            struct ethtool_rxnfc *cmd);
-       void (*del_all_fd_entries)(struct hnae3_handle *handle,
-                                  bool clear_list);
        int (*get_fd_rule_cnt)(struct hnae3_handle *handle,
                               struct ethtool_rxnfc *cmd);
        int (*get_fd_rule_info)(struct hnae3_handle *handle,
@@ -649,6 +652,10 @@ struct hnae3_ae_ops {
        int (*del_cls_flower)(struct hnae3_handle *handle,
                              struct flow_cls_offload *cls_flower);
        bool (*cls_flower_active)(struct hnae3_handle *handle);
+       int (*get_phy_link_ksettings)(struct hnae3_handle *handle,
+                                     struct ethtool_link_ksettings *cmd);
+       int (*set_phy_link_ksettings)(struct hnae3_handle *handle,
+                                     const struct ethtool_link_ksettings *cmd);
 };
 
 struct hnae3_dcb_ops {