Commit 7f309241 authored by K900's avatar K900
Browse files

linux: cherry-pick netfilter fix

parent 57e48042

pkgs/os-specific/linux/kernel/patches.nix

+10 −0
Original line number Diff line number Diff line
@@ -60,4 +60,14 @@ 
    name = "export-rt-sched-migrate";

    patch = ./export-rt-sched-migrate.patch;

  };



  # Backport upstream fix for very annoying Tailscale issue

  # FIXME: remove when merged upstream

  netfilter-typo-fix = {

    name = "netfilter-typo-fix";

    patch = fetchpatch {

      url = "https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/patch/?id=306ed1728e8438caed30332e1ab46b28c25fe3d8";

      hash = "sha256-ZGc1xAIjf+MlV02jhIWZ4jHC742+z/WpN7RenqpU7e4=";

    };

  };

}

pkgs/top-level/linux-kernels.nix

+8 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ in { 
      kernelPatches = [

        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

        kernelPatches.netfilter-typo-fix

      ];

    };
@@ -146,6 +147,7 @@ in { 
        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

        kernelPatches.export-rt-sched-migrate

        kernelPatches.netfilter-typo-fix

      ];

    };
@@ -154,6 +156,7 @@ in { 
      kernelPatches = [

        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

        kernelPatches.netfilter-typo-fix

      ];

    };
@@ -162,6 +165,7 @@ in { 
        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

        kernelPatches.export-rt-sched-migrate

        kernelPatches.netfilter-typo-fix

      ];

    };
@@ -170,6 +174,7 @@ in { 
      kernelPatches = [

        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

        kernelPatches.netfilter-typo-fix

      ];

    };
@@ -178,6 +183,7 @@ in { 
        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

        kernelPatches.export-rt-sched-migrate

        kernelPatches.netfilter-typo-fix

      ];

    };
@@ -194,6 +200,7 @@ in { 
      kernelPatches = [

        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

        kernelPatches.netfilter-typo-fix

      ];

    };
@@ -205,6 +212,7 @@ in { 
        kernelPatches = [

          kernelPatches.bridge_stp_helper

          kernelPatches.request_key_helper

          kernelPatches.netfilter-typo-fix

        ];

      };

      latest = packageAliases.linux_latest.kernel;