diff mbox series

[meta-arago,master] iproute2: Update patch for 6.10.0

Message ID 20240829221348.7079-1-reatmon@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,master] iproute2: Update patch for 6.10.0 | expand

Commit Message

Ryan Eatmon Aug. 29, 2024, 10:13 p.m. UTC 
The patch no longer applied cleanly due to changes in upstream.  Update
the patch to apply cleanly to the 6.10.0 source.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 ...dd-support-for-vlan-tagged-supervisi.patch | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/meta-arago-distro/recipes-connectivity/iproute2/iproute2/0014-iplink-hsr-prp-add-support-for-vlan-tagged-supervisi.patch b/meta-arago-distro/recipes-connectivity/iproute2/iproute2/0014-iplink-hsr-prp-add-support-for-vlan-tagged-supervisi.patch
index c538afdc..b451dc03 100644
--- a/meta-arago-distro/recipes-connectivity/iproute2/iproute2/0014-iplink-hsr-prp-add-support-for-vlan-tagged-supervisi.patch
+++ b/meta-arago-distro/recipes-connectivity/iproute2/iproute2/0014-iplink-hsr-prp-add-support-for-vlan-tagged-supervisi.patch
@@ -23,10 +23,10 @@  diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
 index de08704c5862..94a381769e5a 100644
 --- a/include/uapi/linux/if_link.h
 +++ b/include/uapi/linux/if_link.h
-@@ -901,6 +901,9 @@ enum {
- 	IFLA_HSR_PROTOCOL,		/* Indicate different protocol than
+@@ -1772,6 +1772,9 @@ enum {
  					 * HSR. For example PRP.
  					 */
+	IFLA_HSR_INTERLINK,		/* HSR interlink network device */
 +	IFLA_HSR_SV_VID,		/* Supervision frames VLAN ID */
 +	IFLA_HSR_SV_DEI,		/* Supervision frames VLAN DEI */
 +	IFLA_HSR_SV_PCP,		/* Supervision frames VLAN PCP */
@@ -34,18 +34,18 @@  index de08704c5862..94a381769e5a 100644
  };
  
 diff --git a/ip/iplink_hsr.c b/ip/iplink_hsr.c
-index 6ea138a23cbc..f38c752c0065 100644
+index 42adb430..d7fbbd62 100644
 --- a/ip/iplink_hsr.c
 +++ b/ip/iplink_hsr.c
-@@ -26,6 +26,7 @@ static void print_usage(FILE *f)
- 	fprintf(f,
+@@ -23,6 +23,7 @@ static void print_usage(FILE *f)
  		"Usage:\tip link add name NAME type hsr slave1 SLAVE1-IF slave2 SLAVE2-IF\n"
- 		"\t[ supervision ADDR-BYTE ] [version VERSION] [proto PROTOCOL]\n"
+ 		"\t[ interlink INTERLINK-IF ] [ supervision ADDR-BYTE ] [ version VERSION ]\n"
+ 		"\t[ proto PROTOCOL ]\n"
 +		"\t[ sv_vid SV-VID ] [ sv_pcp SV-PCP ] [ sv_dei SV-DEI ]\n"
  		"\n"
  		"NAME\n"
  		"	name of new hsr device (e.g. hsr0)\n"
-@@ -37,7 +38,15 @@ static void print_usage(FILE *f)
+@@ -36,7 +37,15 @@ static void print_usage(FILE *f)
  		"VERSION\n"
  		"	0,1; the protocol version to be used. (default = 0)\n"
  		"PROTOCOL\n"
@@ -62,7 +62,7 @@  index 6ea138a23cbc..f38c752c0065 100644
  }
  
  static void usage(void)
-@@ -52,6 +61,9 @@ static int hsr_parse_opt(struct link_util *lu, int argc, char **argv,
+@@ -51,6 +60,9 @@ static int hsr_parse_opt(struct link_util *lu, int argc, char **argv,
  	unsigned char multicast_spec;
  	unsigned char protocol_version;
  	unsigned char protocol = HSR_PROTOCOL_HSR;
@@ -72,10 +72,10 @@  index 6ea138a23cbc..f38c752c0065 100644
  
  	while (argc > 0) {
  		if (matches(*argv, "supervision") == 0) {
-@@ -86,6 +98,32 @@ static int hsr_parse_opt(struct link_util *lu, int argc, char **argv,
+@@ -91,6 +103,31 @@ static int hsr_parse_opt(struct link_util *lu, int argc, char **argv,
  			if (ifindex == 0)
  				invarg("No such interface", *argv);
- 			addattr_l(n, 1024, IFLA_HSR_SLAVE2, &ifindex, 4);
+ 			addattr_l(n, 1024, IFLA_HSR_INTERLINK, &ifindex, 4);
 +		} else if (matches(*argv, "sv_vid") == 0) {
 +			NEXT_ARG();
 +			if (get_u16(&sv_vid, *argv, 0))
@@ -101,7 +101,6 @@  index 6ea138a23cbc..f38c752c0065 100644
 +				invarg("SV-DEI is invalid", *argv);
 +			addattr_l(n, 1024, IFLA_HSR_SV_DEI,
 +				  &sv_dei, sizeof(sv_dei));
-+
  		} else if (matches(*argv, "help") == 0) {
  			usage();
  			return -1;