diff options
| author | Michael Forney <mforney@mforney.org> | 2019-08-16 08:38:22 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-08-26 13:27:32 (GMT) |
| commit | 73c1d0479643cf743b72879084e70f738f11bded (patch) | |
| tree | c8cd5809094609bb1890dd5e33bc1e543d4879b5 /lib | |
| parent | 397d880a884866100270fec1899b7edbc2c2fa9f (diff) | |
| download | libnl-73c1d0479643cf743b72879084e70f738f11bded.zip libnl-73c1d0479643cf743b72879084e70f738f11bded.tar.gz libnl-73c1d0479643cf743b72879084e70f738f11bded.tar.bz2 | |
Sync linux headers to 4.19.66
This fixes the build with musl libc.
Additionally, several changes were made to account for changes to the
headers:
- ip_mp_alg.h was removed, since it was removed in linux commit e06e7c61
(v2.6.23), and the last use of those constants was removed in libnl
commit 535e8316.
- Uses of TCF_META_ID_SK_ROUTE_CAPS were updated to
__TCF_META_ID_SK_ROUTE_CAPS, since it was renamed in linux commit
e20e6940 (v3.1).
- Uses of IF_CARRIER_DOWN and IF_CARRIER_UP were replaced with their
values, 0 and 1, since they are not in linux/if.h (they appear to be
libnl-specific, added in libnl commit 3540e44b).
https://github.com/thom311/libnl/pull/222
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/route/cls/ematch/meta.c | 2 | ||||
| -rw-r--r-- | lib/route/cls/ematch_syntax.y | 2 | ||||
| -rw-r--r-- | lib/route/link.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/route/cls/ematch/meta.c b/lib/route/cls/ematch/meta.c index cf9fdae..a26ed4c 100644 --- a/lib/route/cls/ematch/meta.c +++ b/lib/route/cls/ematch/meta.c @@ -199,7 +199,7 @@ static const struct trans_tbl meta_int[] = { __ADD(TCF_META_ID_SK_ERR_QLEN, sk_err_qlen), __ADD(TCF_META_ID_SK_FORWARD_ALLOCS, sk_forward_allocs), __ADD(TCF_META_ID_SK_ALLOCS, sk_allocs), - __ADD(TCF_META_ID_SK_ROUTE_CAPS, sk_route_caps), + __ADD(__TCF_META_ID_SK_ROUTE_CAPS, sk_route_caps), __ADD(TCF_META_ID_SK_HASH, sk_hash), __ADD(TCF_META_ID_SK_LINGERTIME, sk_lingertime), __ADD(TCF_META_ID_SK_ACK_BACKLOG, sk_ack_backlog), diff --git a/lib/route/cls/ematch_syntax.y b/lib/route/cls/ematch_syntax.y index a0ca4bb..82d753d 100644 --- a/lib/route/cls/ematch_syntax.y +++ b/lib/route/cls/ematch_syntax.y @@ -376,7 +376,7 @@ meta_int_id: | META_SK_ERR_QLEN { $$ = META_ID(SK_ERR_QLEN); } | META_SK_FORWARD_ALLOCS { $$ = META_ID(SK_FORWARD_ALLOCS); } | META_SK_ALLOCS { $$ = META_ID(SK_ALLOCS); } - | META_SK_ROUTE_CAPS { $$ = META_ID(SK_ROUTE_CAPS); } + | META_SK_ROUTE_CAPS { $$ = __TCF_META_ID_SK_ROUTE_CAPS; } | META_SK_HASH { $$ = META_ID(SK_HASH); } | META_SK_LINGERTIME { $$ = META_ID(SK_LINGERTIME); } | META_SK_ACK_BACKLOG { $$ = META_ID(SK_ACK_BACKLOG); } diff --git a/lib/route/link.c b/lib/route/link.c index 61113bc..df01a71 100644 --- a/lib/route/link.c +++ b/lib/route/link.c @@ -3103,8 +3103,8 @@ static const struct trans_tbl link_modes[] = { }; static const struct trans_tbl carrier_states[] = { - __ADD(IF_CARRIER_DOWN, down), - __ADD(IF_CARRIER_UP, up), + __ADD(0, down), + __ADD(1, up), }; char *rtnl_link_mode2str(uint8_t st, char *buf, size_t len) |