aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2021-04-02 18:08:22 +0200
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2021-04-02 18:08:22 +0200
commitef1f8e6a7dbb480842be6373cb780a334084e8ea (patch)
treea466f377e39af518b13c61e6f6d63c4a3306c3db
parentf31ee11f3e0d00507a6742d696c752102988167f (diff)
downloadmeta-qcom-ef1f8e6a7dbb480842be6373cb780a334084e8ea.tar.gz
meta-qcom-ef1f8e6a7dbb480842be6373cb780a334084e8ea.tar.bz2
meta-qcom-ef1f8e6a7dbb480842be6373cb780a334084e8ea.zip
iproute2: Allow passing IFLA_RMNET_FLAGS in iplink_rmnetinitramfs-test
This patch in on its way upstream, let's carry it here in the meantime. Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
-rw-r--r--recipes-connectivity/iproute2/iproute2/0001-iplink_rmnet-Allow-passing-IFLA_RMNET_FLAGS.patch102
-rw-r--r--recipes-connectivity/iproute2/iproute2_%.bbappend3
2 files changed, 105 insertions, 0 deletions
diff --git a/recipes-connectivity/iproute2/iproute2/0001-iplink_rmnet-Allow-passing-IFLA_RMNET_FLAGS.patch b/recipes-connectivity/iproute2/iproute2/0001-iplink_rmnet-Allow-passing-IFLA_RMNET_FLAGS.patch
new file mode 100644
index 0000000..dba7f92
--- /dev/null
+++ b/recipes-connectivity/iproute2/iproute2/0001-iplink_rmnet-Allow-passing-IFLA_RMNET_FLAGS.patch
@@ -0,0 +1,102 @@
+From 43d72ce96309b6e6ac7647e868c28d6b5ae958ea Mon Sep 17 00:00:00 2001
+From: Bjorn Andersson <bjorn.andersson@linaro.org>
+Date: Wed, 5 Aug 2020 19:55:47 -0700
+Subject: [PATCH] iplink_rmnet: Allow passing IFLA_RMNET_FLAGS
+
+Parse and pass IFLA_RMNET_FLAGS to the kernel, to allow changing the
+flags from the default of ingress-aggregate only.
+
+Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
+---
+ ip/iplink_rmnet.c | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+diff --git a/ip/iplink_rmnet.c b/ip/iplink_rmnet.c
+index 1d16440c..8a488f3d 100644
+--- a/ip/iplink_rmnet.c
++++ b/ip/iplink_rmnet.c
+@@ -16,6 +16,10 @@ static void print_explain(FILE *f)
+ {
+ fprintf(f,
+ "Usage: ... rmnet mux_id MUXID\n"
++ " [ingress-deaggregation]\n"
++ " [ingress-commands]\n"
++ " [ingress-chksumv4]\n"
++ " [egress-chksumv4]\n"
+ "\n"
+ "MUXID := 1-254\n"
+ );
+@@ -29,6 +33,7 @@ static void explain(void)
+ static int rmnet_parse_opt(struct link_util *lu, int argc, char **argv,
+ struct nlmsghdr *n)
+ {
++ struct ifla_rmnet_flags flags = { };
+ __u16 mux_id;
+
+ while (argc > 0) {
+@@ -37,6 +42,18 @@ static int rmnet_parse_opt(struct link_util *lu, int argc, char **argv,
+ if (get_u16(&mux_id, *argv, 0))
+ invarg("mux_id is invalid", *argv);
+ addattr16(n, 1024, IFLA_RMNET_MUX_ID, mux_id);
++ } else if (matches(*argv, "ingress-deaggregation") == 0) {
++ flags.mask = ~0;
++ flags.flags |= RMNET_FLAGS_INGRESS_DEAGGREGATION;
++ } else if (matches(*argv, "ingress-commands") == 0) {
++ flags.mask = ~0;
++ flags.flags |= RMNET_FLAGS_INGRESS_MAP_COMMANDS;
++ } else if (matches(*argv, "ingress-chksumv4") == 0) {
++ flags.mask = ~0;
++ flags.flags |= RMNET_FLAGS_INGRESS_MAP_CKSUMV4;
++ } else if (matches(*argv, "egress-chksumv4") == 0) {
++ flags.mask = ~0;
++ flags.flags |= RMNET_FLAGS_EGRESS_MAP_CKSUMV4;
+ } else if (matches(*argv, "help") == 0) {
+ explain();
+ return -1;
+@@ -48,11 +65,28 @@ static int rmnet_parse_opt(struct link_util *lu, int argc, char **argv,
+ argc--, argv++;
+ }
+
++ if (flags.mask)
++ addattr_l(n, 1024, IFLA_RMNET_FLAGS, &flags, sizeof(flags));
++
+ return 0;
+ }
+
++static void rmnet_print_flags(FILE *fp, __u32 flags)
++{
++ if (flags & RMNET_FLAGS_INGRESS_DEAGGREGATION)
++ print_string(PRINT_ANY, NULL, "%s ", "ingress-deaggregation");
++ if (flags & RMNET_FLAGS_INGRESS_MAP_COMMANDS)
++ print_string(PRINT_ANY, NULL, "%s ", "ingress-commands");
++ if (flags & RMNET_FLAGS_INGRESS_MAP_CKSUMV4)
++ print_string(PRINT_ANY, NULL, "%s ", "ingress-chksumv4");
++ if (flags & RMNET_FLAGS_EGRESS_MAP_CKSUMV4)
++ print_string(PRINT_ANY, NULL, "%s ", "egress-cksumv4");
++}
++
+ static void rmnet_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
+ {
++ struct ifla_vlan_flags *flags;
++
+ if (!tb)
+ return;
+
+@@ -64,6 +98,14 @@ static void rmnet_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
+ "mux_id",
+ "mux_id %u ",
+ rta_getattr_u16(tb[IFLA_RMNET_MUX_ID]));
++
++ if (tb[IFLA_RMNET_FLAGS]) {
++ if (RTA_PAYLOAD(tb[IFLA_RMNET_FLAGS]) < sizeof(*flags))
++ return;
++ flags = RTA_DATA(tb[IFLA_RMNET_FLAGS]);
++
++ rmnet_print_flags(f, flags->flags);
++ }
+ }
+
+ static void rmnet_print_help(struct link_util *lu, int argc, char **argv,
+--
+2.29.2
+
diff --git a/recipes-connectivity/iproute2/iproute2_%.bbappend b/recipes-connectivity/iproute2/iproute2_%.bbappend
new file mode 100644
index 0000000..dd2176c
--- /dev/null
+++ b/recipes-connectivity/iproute2/iproute2_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+
+SRC_URI_append = " file://0001-iplink_rmnet-Allow-passing-IFLA_RMNET_FLAGS.patch "