summaryrefslogtreecommitdiff
path: root/overlays/preserve-dscp
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2023-04-10 20:56:16 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2023-04-10 20:56:16 +0200
commitc0e3d0e72d9d636728a5171511e3ce1003203567 (patch)
treec75fbcfe4802c48fd5162792f38475d74d2cad57 /overlays/preserve-dscp
parent24207674f36e900fd2aa51787cb70756413962c2 (diff)
downloadnixos-c0e3d0e72d9d636728a5171511e3ce1003203567.tar
nixos-c0e3d0e72d9d636728a5171511e3ce1003203567.tar.gz
nixos-c0e3d0e72d9d636728a5171511e3ce1003203567.tar.bz2
nixos-c0e3d0e72d9d636728a5171511e3ce1003203567.tar.xz
nixos-c0e3d0e72d9d636728a5171511e3ce1003203567.zip
bump
Diffstat (limited to 'overlays/preserve-dscp')
-rw-r--r--overlays/preserve-dscp/default.nix2
-rw-r--r--overlays/preserve-dscp/kern_sec_classifier.patch22
2 files changed, 1 insertions, 23 deletions
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 @@
4 pname = "preserve-dscp"; 4 pname = "preserve-dscp";
5 inherit (sources.bpf-examples) version src; 5 inherit (sources.bpf-examples) version src;
6 6
7 patches = [ ./kern_env.patch ./kern_sec_classifier.patch ]; 7 patches = [ ./kern_env.patch ];
8 8
9 makeFlags = [ "PREFIX=$(out)" ]; 9 makeFlags = [ "PREFIX=$(out)" ];
10 buildFlags = [ "preserve-dscp" ]; 10 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 @@
1diff --git a/preserve-dscp/preserve_dscp_kern.c b/preserve-dscp/preserve_dscp_kern.c
2index 24120cb..b070733 100644
3--- a/preserve-dscp/preserve_dscp_kern.c
4+++ b/preserve-dscp/preserve_dscp_kern.c
5@@ -91,7 +91,7 @@ static void set_dscp(struct __sk_buff *skb, __u8 dscp)
6 ipv6_change_dsfield(ipv6hdr, INET_ECN_MASK, dscp << 2);
7 }
8
9-SEC("classifier/read")
10+SEC("classifier")
11 int read_dscp(struct __sk_buff *skb)
12 {
13 __u32 key = bpf_get_hash_recalc(skb);
14@@ -106,7 +106,7 @@ int read_dscp(struct __sk_buff *skb)
15 return TC_ACT_OK;
16 }
17
18-SEC("classifier/write")
19+SEC("classifier")
20 int write_dscp(struct __sk_buff *skb)
21 {
22 __u32 key = skb->hash;