From c0e3d0e72d9d636728a5171511e3ce1003203567 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 10 Apr 2023 20:56:16 +0200 Subject: bump --- overlays/preserve-dscp/default.nix | 2 +- overlays/preserve-dscp/kern_sec_classifier.patch | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 overlays/preserve-dscp/kern_sec_classifier.patch (limited to 'overlays/preserve-dscp') diff --git a/overlays/preserve-dscp/default.nix b/overlays/preserve-dscp/default.nix index 7f956a12..972223a0 100644 --- a/overlays/preserve-dscp/default.nix +++ b/overlays/preserve-dscp/default.nix @@ -4,7 +4,7 @@ pname = "preserve-dscp"; inherit (sources.bpf-examples) version src; - patches = [ ./kern_env.patch ./kern_sec_classifier.patch ]; + patches = [ ./kern_env.patch ]; makeFlags = [ "PREFIX=$(out)" ]; buildFlags = [ "preserve-dscp" ]; diff --git a/overlays/preserve-dscp/kern_sec_classifier.patch b/overlays/preserve-dscp/kern_sec_classifier.patch deleted file mode 100644 index 465b36f6..00000000 --- a/overlays/preserve-dscp/kern_sec_classifier.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/preserve-dscp/preserve_dscp_kern.c b/preserve-dscp/preserve_dscp_kern.c -index 24120cb..b070733 100644 ---- a/preserve-dscp/preserve_dscp_kern.c -+++ b/preserve-dscp/preserve_dscp_kern.c -@@ -91,7 +91,7 @@ static void set_dscp(struct __sk_buff *skb, __u8 dscp) - ipv6_change_dsfield(ipv6hdr, INET_ECN_MASK, dscp << 2); - } - --SEC("classifier/read") -+SEC("classifier") - int read_dscp(struct __sk_buff *skb) - { - __u32 key = bpf_get_hash_recalc(skb); -@@ -106,7 +106,7 @@ int read_dscp(struct __sk_buff *skb) - return TC_ACT_OK; - } - --SEC("classifier/write") -+SEC("classifier") - int write_dscp(struct __sk_buff *skb) - { - __u32 key = skb->hash; -- cgit v1.2.3