From: Greg Kroah-Hartman Date: Thu, 15 Nov 2012 04:06:00 +0000 (-0800) Subject: remove drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free... X-Git-Tag: v3.0.52~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6dbfb13dc1b787e51cd306048a5ca6d66d474b04;p=thirdparty%2Fkernel%2Fstable-queue.git remove drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free.patch from the 3.0, 3.4 and 3.6 kernels --- diff --git a/queue-3.0/drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free.patch b/queue-3.0/drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free.patch deleted file mode 100644 index 4630eeb17c4..00000000000 --- a/queue-3.0/drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2204849a85383fbde75680aa199142abe504adbb Mon Sep 17 00:00:00 2001 -From: Peter Senna Tschudin -Date: Sun, 28 Oct 2012 06:12:01 +0000 -Subject: drivers/net/phy/mdio-bitbang.c: Call mdiobus_unregister before mdiobus_free - - -From: Peter Senna Tschudin - -[ Upstream commit aa731872f7d33dcb8b54dad0cfb82d4e4d195d7e ] - -Based on commit b27393aecf66199f5ddad37c302d3e0cfadbe6c0 - -Calling mdiobus_free without calling mdiobus_unregister causes -BUG_ON(). This patch fixes the issue. - -The semantic patch that found this issue(http://coccinelle.lip6.fr/): -// -@@ -expression E; -@@ - ... when != mdiobus_unregister(E); - -+ mdiobus_unregister(E); - mdiobus_free(E); -// - -Signed-off-by: Peter Senna Tschudin -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/phy/mdio-bitbang.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/phy/mdio-bitbang.c -+++ b/drivers/net/phy/mdio-bitbang.c -@@ -225,6 +225,7 @@ void free_mdio_bitbang(struct mii_bus *b - struct mdiobb_ctrl *ctrl = bus->priv; - - module_put(ctrl->ops->owner); -+ mdiobus_unregister(bus); - mdiobus_free(bus); - } - EXPORT_SYMBOL(free_mdio_bitbang); diff --git a/queue-3.0/series b/queue-3.0/series index 3622d22c664..ed58929c8fe 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -27,7 +27,6 @@ tcp-fix-fionread-siocinq.patch ipv6-set-default-hoplimit-as-zero.patch net-usb-fix-memory-leak-on-tx-data-path.patch net-fix-divide-by-zero-in-tcp-algorithm-illinois.patch -drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free.patch l2tp-fix-oops-in-l2tp_eth_create-error-path.patch ipv6-send-unsolicited-neighbour-advertisements-to-all-nodes.patch futex-handle-futex_pi-owner_died-take-over-correctly.patch diff --git a/queue-3.4/drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free.patch b/queue-3.4/drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free.patch deleted file mode 100644 index de1fbf797e8..00000000000 --- a/queue-3.4/drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 111f54cfd6727b18a032e5434e7b4c425f428c34 Mon Sep 17 00:00:00 2001 -From: Peter Senna Tschudin -Date: Sun, 28 Oct 2012 06:12:01 +0000 -Subject: drivers/net/phy/mdio-bitbang.c: Call mdiobus_unregister before mdiobus_free - - -From: Peter Senna Tschudin - -[ Upstream commit aa731872f7d33dcb8b54dad0cfb82d4e4d195d7e ] - -Based on commit b27393aecf66199f5ddad37c302d3e0cfadbe6c0 - -Calling mdiobus_free without calling mdiobus_unregister causes -BUG_ON(). This patch fixes the issue. - -The semantic patch that found this issue(http://coccinelle.lip6.fr/): -// -@@ -expression E; -@@ - ... when != mdiobus_unregister(E); - -+ mdiobus_unregister(E); - mdiobus_free(E); -// - -Signed-off-by: Peter Senna Tschudin -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/phy/mdio-bitbang.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/phy/mdio-bitbang.c -+++ b/drivers/net/phy/mdio-bitbang.c -@@ -234,6 +234,7 @@ void free_mdio_bitbang(struct mii_bus *b - struct mdiobb_ctrl *ctrl = bus->priv; - - module_put(ctrl->ops->owner); -+ mdiobus_unregister(bus); - mdiobus_free(bus); - } - EXPORT_SYMBOL(free_mdio_bitbang); diff --git a/queue-3.4/series b/queue-3.4/series index a0bbf31c57a..8ccce254e92 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -41,7 +41,6 @@ ipv6-set-default-hoplimit-as-zero.patch net-usb-fix-memory-leak-on-tx-data-path.patch net-fix-divide-by-zero-in-tcp-algorithm-illinois.patch drivers-net-ethernet-nxp-lpc_eth.c-call-mdiobus_unregister-before-mdiobus_free.patch -drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free.patch l2tp-fix-oops-in-l2tp_eth_create-error-path.patch net-inet_diag-return-error-code-if-protocol-handler-is-missed.patch af-packet-fix-oops-when-socket-is-not-present.patch diff --git a/queue-3.6/drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free.patch b/queue-3.6/drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free.patch deleted file mode 100644 index 5ce80dd6739..00000000000 --- a/queue-3.6/drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2c32599a66b7c4d3780fe9195e649844936f1517 Mon Sep 17 00:00:00 2001 -From: Peter Senna Tschudin -Date: Sun, 28 Oct 2012 06:12:01 +0000 -Subject: drivers/net/phy/mdio-bitbang.c: Call mdiobus_unregister before mdiobus_free - - -From: Peter Senna Tschudin - -[ Upstream commit aa731872f7d33dcb8b54dad0cfb82d4e4d195d7e ] - -Based on commit b27393aecf66199f5ddad37c302d3e0cfadbe6c0 - -Calling mdiobus_free without calling mdiobus_unregister causes -BUG_ON(). This patch fixes the issue. - -The semantic patch that found this issue(http://coccinelle.lip6.fr/): -// -@@ -expression E; -@@ - ... when != mdiobus_unregister(E); - -+ mdiobus_unregister(E); - mdiobus_free(E); -// - -Signed-off-by: Peter Senna Tschudin -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/phy/mdio-bitbang.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/phy/mdio-bitbang.c -+++ b/drivers/net/phy/mdio-bitbang.c -@@ -234,6 +234,7 @@ void free_mdio_bitbang(struct mii_bus *b - struct mdiobb_ctrl *ctrl = bus->priv; - - module_put(ctrl->ops->owner); -+ mdiobus_unregister(bus); - mdiobus_free(bus); - } - EXPORT_SYMBOL(free_mdio_bitbang); diff --git a/queue-3.6/series b/queue-3.6/series index 5849c87a62b..80695d412af 100644 --- a/queue-3.6/series +++ b/queue-3.6/series @@ -49,7 +49,6 @@ ipv6-set-default-hoplimit-as-zero.patch net-usb-fix-memory-leak-on-tx-data-path.patch net-fix-divide-by-zero-in-tcp-algorithm-illinois.patch drivers-net-ethernet-nxp-lpc_eth.c-call-mdiobus_unregister-before-mdiobus_free.patch -drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free.patch l2tp-fix-oops-in-l2tp_eth_create-error-path.patch tcp-repair-handle-zero-length-data-put-in-rcv-queue.patch net-inet_diag-return-error-code-if-protocol-handler-is-missed.patch