Repository navigation
Conversation
All these '#define' are now part of the kernel UAPI, and cause conflict
when netinet's tcp.h file has them defined there as well, e.g.
tcp.h:132:9: error: 'TCP_ACCECN_ACE_FAIL_SEND' redefined [-Werror]
132 | #define TCP_ACCECN_ACE_FAIL_SEND BIT(0)
| ^~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/netinet/tcp.h:245:9: note: this is the location of the previous definition
245 | #define TCP_ACCECN_ACE_FAIL_SEND 0x1
| ^~~~~~~~~~~~~~~~~~~~~~~~
Conditionally set all these '#define' if they are not already defined to
continue to support environments where they are not set. A single
'#ifndef' would be enough, but it looks better to have a check per
block not to mess-up with the comments and avoid potential confusions.
Fixes: 9ee1eb4 ("net-test: pacetkdrill: Add ecn_mode, AccECN status, and tcpi_option2 in tcpi")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Collaborator
|
Thanks! I fixed a typo in the commit title and extended the Fixes SHA1 to be 12 characters, and merged here: |
Contributor
Author
Thank you! Funny, I blindly copy-pasted it from the 'Fixes' commit :) |
This file contains hidden or 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
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.
All these '#define' are now part of the kernel UAPI, and cause conflict when netinet's
tcp.hfile has them defined there as well, e.g.Conditionally set all these
#defineif they are not already defined to continue to support environments where they are not set. A single#ifndefwould be enough, but it looks better to have a check per block not to mess-up with the comments and avoid potential confusions.Fixes: 9ee1eb4 ("net-test: pacetkdrill: Add ecn_mode, AccECN status, and tcpi_option2 in tcpi")