remove drivers-net-phy-mdio-bitbang.c-call-mdiobus_unregister-before-mdiobus_free...

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 (file)
index 4630eeb..0000000
--- 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 <peter.senna@gmail.com>
-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 <peter.senna@gmail.com>
-
-[ 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/):
-// <smpl>
-@@
-expression E;
-@@
-  ... when != mdiobus_unregister(E);
-
-+ mdiobus_unregister(E);
-  mdiobus_free(E);
-// </smpl>
-
-Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 3622d22c6645368309794818a1967a704c79a4d1..ed58929c8fe08d0c2fb01774dd38d9c0ebf090e1 100644 (file)
--- 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 (file)
index de1fbf7..0000000
--- 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 <peter.senna@gmail.com>
-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 <peter.senna@gmail.com>
-
-[ 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/):
-// <smpl>
-@@
-expression E;
-@@
-  ... when != mdiobus_unregister(E);
-
-+ mdiobus_unregister(E);
-  mdiobus_free(E);
-// </smpl>
-
-Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 a0bbf31c57a9d6260222b7fc2430f657ec56cf29..8ccce254e92959cbf03329f3c6e8f82100ed5fa0 100644 (file)
--- 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 (file)
index 5ce80dd..0000000
--- 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 <peter.senna@gmail.com>
-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 <peter.senna@gmail.com>
-
-[ 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/):
-// <smpl>
-@@
-expression E;
-@@
-  ... when != mdiobus_unregister(E);
-
-+ mdiobus_unregister(E);
-  mdiobus_free(E);
-// </smpl>
-
-Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 5849c87a62b8f520016493542b9b555c9d6fae1d..80695d412af83019ea31c2a401179bd7e5964035 100644 (file)
--- 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