Skip to content

Commit 5d3c163

Browse files
committed
sync to upstream net-next as of v6.19-rc0
net after pulling net-next during the merge window: 0373d5c387f2 ("bnxt_en: Fix XDP_TX path") Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 50c7918 commit 5d3c163

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2755
-90
lines changed

Makefile.deps

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,4 @@ CFLAGS_tc:= $(call get_hdr_inc,__LINUX_RTNETLINK_H,rtnetlink.h) \
4848
$(call get_hdr_inc,_TC_SKBEDIT_H,tc_act/tc_skbedit.h) \
4949
$(call get_hdr_inc,_TC_TUNNEL_KEY_H,tc_act/tc_tunnel_key.h)
5050
CFLAGS_tcp_metrics:=$(call get_hdr_inc,_LINUX_TCP_METRICS_H,tcp_metrics.h)
51+
CFLAGS_wireguard:=$(call get_hdr_inc,_LINUX_WIREGUARD_H,wireguard.h)

generated/binder-user.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/* Do not edit directly, auto-generated from: */
33
/* Documentation/netlink/specs/binder.yaml */
44
/* YNL-GEN user source */
5+
/* To regenerate run: tools/net/ynl/ynl-regen.sh */
56

67
#include <stdlib.h>
78
#include <string.h>

generated/devlink-user.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/* Do not edit directly, auto-generated from: */
33
/* Documentation/netlink/specs/devlink.yaml */
44
/* YNL-GEN user source */
5+
/* To regenerate run: tools/net/ynl/ynl-regen.sh */
56

67
#include <stdlib.h>
78
#include <string.h>
@@ -158,6 +159,7 @@ const char *devlink_sb_threshold_type_str(enum devlink_sb_threshold_type value)
158159
static const char * const devlink_eswitch_mode_strmap[] = {
159160
[0] = "legacy",
160161
[1] = "switchdev",
162+
[2] = "switchdev-inactive",
161163
};
162164

163165
const char *devlink_eswitch_mode_str(enum devlink_eswitch_mode value)
@@ -911,6 +913,7 @@ const struct ynl_policy_attr devlink_policy[DEVLINK_ATTR_MAX + 1] = {
911913
[DEVLINK_ATTR_REGION_DIRECT] = { .name = "region-direct", .type = YNL_PT_FLAG, },
912914
[DEVLINK_ATTR_RATE_TC_BWS] = { .name = "rate-tc-bws", .type = YNL_PT_NEST, .nest = &devlink_dl_rate_tc_bws_nest, },
913915
[DEVLINK_ATTR_HEALTH_REPORTER_BURST_PERIOD] = { .name = "health-reporter-burst-period", .type = YNL_PT_U64, },
916+
[DEVLINK_ATTR_PARAM_RESET_DEFAULT] = { .name = "param-reset-default", .type = YNL_PT_FLAG, },
914917
};
915918

916919
const struct ynl_policy_nest devlink_nest = {
@@ -4643,6 +4646,8 @@ int devlink_param_set(struct ynl_sock *ys, struct devlink_param_set_req *req)
46434646
ynl_attr_put_u8(nlh, DEVLINK_ATTR_PARAM_TYPE, req->param_type);
46444647
if (req->_present.param_value_cmode)
46454648
ynl_attr_put_u8(nlh, DEVLINK_ATTR_PARAM_VALUE_CMODE, req->param_value_cmode);
4649+
if (req->_present.param_reset_default)
4650+
ynl_attr_put(nlh, DEVLINK_ATTR_PARAM_RESET_DEFAULT, NULL, 0);
46464651

46474652
err = ynl_exec(ys, nlh, &yrs);
46484653
if (err < 0)

generated/dpll-user.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/* Do not edit directly, auto-generated from: */
33
/* Documentation/netlink/specs/dpll.yaml */
44
/* YNL-GEN user source */
5+
/* To regenerate run: tools/net/ynl/ynl-regen.sh */
56

67
#include <stdlib.h>
78
#include <string.h>

0 commit comments

Comments
 (0)