net: phytmac_ethtool: Add struct kernel_ethtool_ts_info #25
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2111375: net: Add struct kernel_ethtool_ts_info cause build error, so convert ethtool_ts_info to kernel_ethtool_ts_info Log: drivers/net/ethernet/phytium/phytmac_ethtool.c: In function ‘phytmac_get_ts_info’: drivers/net/ethernet/phytium/phytmac_ethtool.c:204:45: error: passing argument 2 of ‘ethtool_op_get_ts_info’ from incompatible pointer type [-Werror=incompatible-pointer-types] 204 | return ethtool_op_get_ts_info(ndev, info); | ^~~~ | | | struct ethtool_ts_info * In file included from drivers/net/ethernet/phytium/phytmac_ethtool.c:3: ./include/linux/ethtool.h:1205:59: note: expected ‘struct kernel_ethtool_ts_info *’ but argument is of type ‘struct ethtool_ts_info *’ 1205 | struct kernel_ethtool_ts_info *eti); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~ drivers/net/ethernet/phytium/phytmac_ethtool.c: At top level: drivers/net/ethernet/phytium/phytmac_ethtool.c:522:43: error: initialization of ‘int (*)(struct net_device *, struct kernel_ethtool_ts_info *)’ from incompatible pointer type ‘int (*)(struct net_device *, struct ethtool_ts_info *)’ [-Werror=incompatible-pointer-types] 522 | .get_ts_info = phytmac_get_ts_info, | ^~~~~~~~~~~~~~~~~~~ drivers/net/ethernet/phytium/phytmac_ethtool.c:522:43: note: (near initialization for ‘phytmac_ethtool_ops.get_ts_info’) cc1: all warnings being treated as errors
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
MingcongBai
merged commit 7263173
into
deepin-community:deepin/v6.12-rc7
2 of 8 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
2111375: net: Add struct kernel_ethtool_ts_info cause build error, so convert ethtool_ts_info to kernel_ethtool_ts_info
Log:
drivers/net/ethernet/phytium/phytmac_ethtool.c: In function ‘phytmac_get_ts_info’: drivers/net/ethernet/phytium/phytmac_ethtool.c:204:45: error: passing argument 2 of ‘ethtool_op_get_ts_info’ from incompatible pointer type [-Werror=incompatible-pointer-types]
204 | return ethtool_op_get_ts_info(ndev, info);
| ^~~~
| |
| struct ethtool_ts_info *
In file included from drivers/net/ethernet/phytium/phytmac_ethtool.c:3:
./include/linux/ethtool.h:1205:59: note: expected ‘struct kernel_ethtool_ts_info *’ but argument is of type ‘struct ethtool_ts_info *’
1205 | struct kernel_ethtool_ts_info eti);
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/net/ethernet/phytium/phytmac_ethtool.c: At top level:
drivers/net/ethernet/phytium/phytmac_ethtool.c:522:43: error: initialization of ‘int ()(struct net_device *, struct kernel_ethtool_ts_info )’ from incompatible pointer type ‘int ()(struct net_device *, struct ethtool_ts_info *)’ [-Werror=incompatible-pointer-types]
522 | .get_ts_info = phytmac_get_ts_info,
| ^~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/phytium/phytmac_ethtool.c:522:43: note: (near initialization for ‘phytmac_ethtool_ops.get_ts_info’)
cc1: all warnings being treated as errors