BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "kernel: Add a patch to remove checks for bridge stp helpers"

Browse source 
This reverts commit f64c3ce18d.
This commit is contained in:
William A. Kennington III 2015-01-13 15:34:26 -08:00
parent f64c3ce18d
commit 3d4b315d91
3 changed files with 8 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
pkgs/os-specific/linux/kernel/dont-require-bridge-helper.patch
View file

@ -1,50 +0,0 @@
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 4114687..49832c0 100644
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -124,12 +124,6 @@ void br_stp_disable_port(struct net_bridge_port *p)
static void br_stp_start(struct net_bridge *br)
{
- int r;
- char *argv[] = { BR_STP_PROG, br->dev->name, "start", NULL };
- char *envp[] = { NULL };
-
- r = call_usermodehelper(BR_STP_PROG, argv, envp, UMH_WAIT_PROC);
-
spin_lock_bh(&br->lock);
if (br->bridge_forward_delay < BR_MIN_FORWARD_DELAY)
@@ -137,29 +131,16 @@ static void br_stp_start(struct net_bridge *br)
else if (br->bridge_forward_delay > BR_MAX_FORWARD_DELAY)
__br_set_forward_delay(br, BR_MAX_FORWARD_DELAY);
- if (r == 0) {
- br->stp_enabled = BR_USER_STP;
- br_debug(br, "userspace STP started\n");
- } else {
- br->stp_enabled = BR_KERNEL_STP;
- br_debug(br, "using kernel STP\n");
-
- /* To start timers on any ports left in blocking */
- br_port_state_selection(br);
- }
+ br->stp_enabled = BR_USER_STP;
+ br_debug(br, "userspace STP started\n");
spin_unlock_bh(&br->lock);
}
static void br_stp_stop(struct net_bridge *br)
{
- int r;
- char *argv[] = { BR_STP_PROG, br->dev->name, "stop", NULL };
- char *envp[] = { NULL };
-
if (br->stp_enabled == BR_USER_STP) {
- r = call_usermodehelper(BR_STP_PROG, argv, envp, UMH_WAIT_PROC);
- br_info(br, "userspace STP stopped, return code %d\n", r);
+ br_info(br, "userspace STP stoppe\n");
/* To start timers on any ports left in blocking */
spin_lock_bh(&br->lock);

5
pkgs/os-specific/linux/kernel/patches.nix
View file

@ -32,11 +32,6 @@ in
rec {
dont_require_bridge_helper =
{ name = "dont-require-bridge-helper";
patch = ./dont-require-bridge-helper.patch;
};
no_xsave =
{ name = "no-xsave";
patch = ./no-xsave.patch;

24
pkgs/top-level/all-packages.nix
View file

@ -8395,13 +8395,12 @@ let
linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = [ kernelPatches.dont_require_bridge_helper ];
kernelPatches = [];
};
linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = [ kernelPatches.dont_require_bridge_helper ]
++ lib.optionals ((platform.kernelArch or null) == "mips")
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
];
@ -8409,13 +8408,11 @@ let
linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = [ kernelPatches.dont_require_bridge_helper ];
};
linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = [ kernelPatches.dont_require_bridge_helper ]
++ lib.optionals ((platform.kernelArch or null) == "mips")
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
@ -8424,8 +8421,7 @@ let
linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = [ kernelPatches.dont_require_bridge_helper ]
++ lib.optionals ((platform.kernelArch or null) == "mips")
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
@ -8434,8 +8430,7 @@ let
linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = [ kernelPatches.dont_require_bridge_helper ]
++ lib.optionals ((platform.kernelArch or null) == "mips")
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
@ -8444,8 +8439,7 @@ let
linux_3_17 = makeOverridable (import ../os-specific/linux/kernel/linux-3.17.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = [ kernelPatches.dont_require_bridge_helper ]
++ lib.optionals ((platform.kernelArch or null) == "mips")
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
@ -8454,8 +8448,7 @@ let
linux_3_18 = makeOverridable (import ../os-specific/linux/kernel/linux-3.18.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = [ kernelPatches.dont_require_bridge_helper ]
++ lib.optionals ((platform.kernelArch or null) == "mips")
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
@ -8464,8 +8457,7 @@ let
linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = [ kernelPatches.dont_require_bridge_helper ]
++ lib.optionals ((platform.kernelArch or null) == "mips")
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32