diff options
| author | Zefan Li <lizefan@huawei.com> | 2016-03-17 09:39:13 +0800 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2016-03-17 09:39:13 +0800 |
| commit | 829eb7f1b3b832315c32727b6bbccfcd89b08766 (patch) | |
| tree | f74289275293750188ae022c7ba140e6cb1fc192 | |
| parent | 5bae7fe2cc60255215a03e422237e23d33c5ef1d (diff) | |
| download | linux-3.4.y-queue-829eb7f1b3b832315c32727b6bbccfcd89b08766.tar.gz | |
Remove a broken fix
| -rw-r--r-- | patches/net-ax.25-stop-heartbeat-timer-on-disconnect.patch | 28 | ||||
| -rw-r--r-- | patches/series | 1 |
2 files changed, 0 insertions, 29 deletions
diff --git a/patches/net-ax.25-stop-heartbeat-timer-on-disconnect.patch b/patches/net-ax.25-stop-heartbeat-timer-on-disconnect.patch deleted file mode 100644 index 570e549..0000000 --- a/patches/net-ax.25-stop-heartbeat-timer-on-disconnect.patch +++ /dev/null @@ -1,28 +0,0 @@ -From da278622bf04f8ddb14519a2b8214e108ef26101 Mon Sep 17 00:00:00 2001 -From: Richard Stearn <richard@rns-stearn.demon.co.uk> -Date: Mon, 13 Jul 2015 11:38:24 +0200 -Subject: NET: AX.25: Stop heartbeat timer on disconnect. - -commit da278622bf04f8ddb14519a2b8214e108ef26101 upstream. - -This may result in a kernel panic. The bug has always existed but -somehow we've run out of luck now and it bites. - -Signed-off-by: Richard Stearn <richard@rns-stearn.demon.co.uk> -Signed-off-by: Ralf Baechle <ralf@linux-mips.org> -Signed-off-by: David S. Miller <davem@davemloft.net> -Signed-off-by: Zefan Li <lizefan@huawei.com> ---- - net/ax25/ax25_subr.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/net/ax25/ax25_subr.c -+++ b/net/ax25/ax25_subr.c -@@ -264,6 +264,7 @@ void ax25_disconnect(ax25_cb *ax25, int - { - ax25_clear_queues(ax25); - -+ ax25_stop_heartbeat(ax25); - ax25_stop_t1timer(ax25); - ax25_stop_t2timer(ax25); - ax25_stop_t3timer(ax25); diff --git a/patches/series b/patches/series index 4949b24..3e20da2 100644 --- a/patches/series +++ b/patches/series @@ -27,7 +27,6 @@ libata-add-ata_horkage_notrim.patch libata-force-disable-trim-for-supersspeed-s238.patch libata-increase-the-timeout-when-setting-transfer-mode.patch net-clone-skb-before-setting-peeked-flag.patch -net-ax.25-stop-heartbeat-timer-on-disconnect.patch can-mcp251x-fix-resume-when-device-is-down.patch mac80211-clear-subdir_stations-when-removing-debugfs.patch inet-frags-fix-defragmented-packet-s-ip-header-for-af_packet.patch |