- up to 2.10.1

diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index 0067a20aa995dd6e80c57b0e92977383cdbb9c05..b1a0b505d4f6f3d1d4c0b014f03df9ee460c51d7 100644 (file)
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -41,12 +41,12 @@ exit 1
 Summary:       DAHDI telephony device support
 Summary(pl.UTF-8):     Obsługa urządzeń telefonicznych DAHDI
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       2.10.0.1
+Version:       2.10.1
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-%{version}.tar.gz
-# Source0-md5: a23e91cc474f241616a5a038ae2b1e72
+# Source0-md5: 6ccb1bf79007ace9bc6d17fe1354bc21
 Source3:       %{FIRMWARE_URL}/dahdi-fw-oct6114-064-1.05.01.tar.gz
 # Source3-md5: 88db9b7a07d8392736171b1b3e6bcc66
 Source4:       %{FIRMWARE_URL}/dahdi-fw-oct6114-128-1.05.01.tar.gz
@@ -57,7 +57,6 @@ Source6:      %{FIRMWARE_URL}/dahdi-fw-tc400m-MR6.12.tar.gz
 # Source6-md5: 2ea860bb8a9d8ede2858b9557b74ee3c
 Source7:       %{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
 # Source7-md5: a7f3886942bb3e9fed349a41b3390c9f
-Patch0:                linux-3.18.patch
 URL:           http://www.asterisk.org/
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 BuildRequires: perl-base
@@ -157,7 +156,6 @@ cd ../..\
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
 
 for a in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do
        ln -s $a drivers/dahdi/firmware

diff --git a/linux-3.18.patch b/linux-3.18.patch
deleted file mode 100644 (file)
index 03cecdd..0000000
--- a/linux-3.18.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- dahdi-linux-2.10.0.1/drivers/dahdi/wcte43x-base.c~ 2014-09-22 20:40:19.000000000 +0200
-+++ dahdi-linux-2.10.0.1/drivers/dahdi/wcte43x-base.c  2015-01-26 00:29:29.559216394 +0100
-@@ -3581,7 +3581,11 @@
-               return;
- 
-       wc->not_ready = 1;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
-       smp_mb__after_clear_bit();
-+#else
-+      smp_mb__after_atomic();
-+#endif
- 
-       /* Stop everything */
-       wcxb_stop(&wc->xb);
---- dahdi-linux-2.10.0.1/drivers/dahdi/wcaxx-base.c~   2014-09-22 20:40:19.000000000 +0200
-+++ dahdi-linux-2.10.0.1/drivers/dahdi/wcaxx-base.c    2015-01-26 00:30:14.289214817 +0100
-@@ -3823,7 +3823,11 @@
-       unsigned long flags;
- 
-       clear_bit(INITIALIZED, &wc->bit_flags);
--      smp_mb__after_clear_bit();
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
-+      smp_mb__after_clear_bit();
-+#else
-+      smp_mb__after_atomic();
-+#endif
- 
-       /* Make sure we're not on the card list anymore. */
-       mutex_lock(&card_list_lock);
---- dahdi-linux-2.10.0.1/drivers/dahdi/wcte12xp/base.c~        2014-09-22 20:40:19.000000000 +0200
-+++ dahdi-linux-2.10.0.1/drivers/dahdi/wcte12xp/base.c 2015-01-26 00:30:47.229213654 +0100
-@@ -2110,7 +2110,11 @@
-        * them. */
-       clear_bit(INITIALIZED, &wc->bit_flags);
-       synchronize_irq(wc->vb.pdev->irq);
--      smp_mb__after_clear_bit();
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
-+      smp_mb__after_clear_bit();
-+#else
-+      smp_mb__after_atomic();
-+#endif
-       del_timer_sync(&wc->timer);
-       flush_workqueue(wc->wq);
- 
-@@ -3076,7 +3080,11 @@
-       remove_sysfs_files(wc);
- 
-       clear_bit(INITIALIZED, &wc->bit_flags);
--      smp_mb__after_clear_bit();
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
-+      smp_mb__after_clear_bit();
-+#else
-+      smp_mb__after_atomic();
-+#endif
- 
-       del_timer_sync(&wc->timer);
-       flush_workqueue(wc->wq);
---- dahdi-linux-2.10.0.1/drivers/dahdi/wcte13xp-base.c~        2014-09-22 20:40:19.000000000 +0200
-+++ dahdi-linux-2.10.0.1/drivers/dahdi/wcte13xp-base.c 2015-01-26 00:31:17.379212592 +0100
-@@ -1849,7 +1849,11 @@
-       clear_bit(INITIALIZED, &wc->bit_flags);
-       disable_irq(wc->xb.pdev->irq);
- 
--      smp_mb__after_clear_bit();
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
-+      smp_mb__after_clear_bit();
-+#else
-+      smp_mb__after_atomic();
-+#endif
-       del_timer_sync(&wc->timer);
-       flush_workqueue(wc->wq);
- 
-@@ -2725,7 +2729,11 @@
-               return;
- 
-       clear_bit(INITIALIZED, &wc->bit_flags);
--      smp_mb__after_clear_bit();
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
-+      smp_mb__after_clear_bit();
-+#else
-+      smp_mb__after_atomic();
-+#endif
- 
-       /* Quiesce DMA engine interrupts */
-       wcxb_stop(&wc->xb);