webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 02:55:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x

Browse Source
This commit is contained in:
root
2009-04-05 11:17:01 +02:00
parent cc3f6e5c01 0235d31b88
commit d1955482de
13 changed files with 385 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/kernel/kernel.config.i586
View File

@@ -1788,7 +1788,7 @@ CONFIG_MISDN_AVM_FRITZ=y
CONFIG_MISDN_NETJET=y
CONFIG_MISDN_HFCPCI=y
CONFIG_MISDN_HFCMULTI=y
CONFIG_HFCMULTI_PCIMEM=y
# CONFIG_HFCMULTI_PCIMEM is not set
CONFIG_MISDN_HFCUSB=y
CONFIG_MISDN_HFCMINI=y
CONFIG_MISDN_XHFC=y

2
config/rootfiles/common/mISDN
View File

@@ -1,3 +1,5 @@
etc/rc.d/init.d/mISDN
usr/bin/isdnbridge
usr/bin/loadfirm
usr/bin/mISDNdebugtool
usr/bin/misdnportinfo

1
config/rootfiles/core/28/filelists/files
View File

@@ -3,6 +3,7 @@ etc/rc.d/init.d/snort
etc/ssh/moduli
etc/ssh/ssh_config
etc/ssh/sshd_config
etc/modprobe.d/blacklist
usr/bin/scp
usr/bin/sftp
usr/bin/slogin

2
config/rootfiles/packages/samba
View File

@@ -70,6 +70,7 @@ usr/lib/samba/vfs/acl_xattr.so
usr/lib/samba/vfs/audit.so
usr/lib/samba/vfs/cap.so
usr/lib/samba/vfs/default_quota.so
usr/lib/samba/vfs/dirsort.so
usr/lib/samba/vfs/expand_msdfs.so
usr/lib/samba/vfs/extd_audit.so
usr/lib/samba/vfs/fake_perms.so
@@ -154,6 +155,7 @@ usr/sbin/winbindd
#usr/share/man/man8/vfs_catia.8
#usr/share/man/man8/vfs_commit.8
#usr/share/man/man8/vfs_default_quota.8
#usr/share/man/man8/vfs_dirsort.8
#usr/share/man/man8/vfs_extd_audit.8
#usr/share/man/man8/vfs_fake_perms.8
#usr/share/man/man8/vfs_fileid.8

8
config/udev/blacklist
View File

@@ -17,3 +17,11 @@ blacklist l3udss1
blacklist mISDN_capi
blacklist mISDN_isac
blacklist hfcsusb
blacklist hfcpci
blacklist hfcsmini
blacklist l1oip
blacklist mISDN_dsp
blacklist netjetpci
blacklist sedlfax
blacklist w6692pci
blacklist xhfc

4
doc/packages-list.txt
View File

@@ -184,7 +184,7 @@
* lynis-1.2.3
* lzo-2.02
* m4-1.4.4
* mISDNuser-1_1_9
* mISDNuser.git-f69adb52764c392135800f9a87c9018f9f268139
* madwifi-hal-0.10.5.6-r3942-20090205-kmod-2.6.27.21
* make-3.81
* man-db-2.4.3
@@ -257,7 +257,7 @@
* rssdler-0.4.0a
* rsync-3.0.4
* rtorrent-0.8.4
* samba-3.3.2
* samba-3.3.3
* sane-1.0.19
* screen-4.0.3
* sdparm-1.01

9
lfs/linux
View File

@@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
mISDN_VER = mISDN-1_1_9
mISDN_VER = mISDN.git-ad5e8abaed89ce6539104b819eef011655cd0b04
# Normal build or SMP build.
#
@@ -65,7 +65,7 @@ $(DL_FILE)_MD5 = 2912af7938fae1a3f2a9a6bcf8c0009f
netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
$(mISDN_VER).tar.gz_MD5 = bb8beb974d581243442d89f66e6928da
$(mISDN_VER).tar.gz_MD5 = 480a947458c3f254aba489a807f98a29
reiser4-for-2.6.27.19.patch.bz2_MD5 = 22988387f64f299489b90b484b2642cc
install : $(TARGET)
@@ -137,10 +137,11 @@ endif
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-disable_mISDNv2.patch
cd $(DIR_APP) rm -rf drivers/isdn/mISDN drivers/isdn/hardware/mISDN
# add mISDNv1
# add mISDNv1.2
cd $(DIR_SRC) && rm -rf mISDN-*
cd $(DIR_SRC) && tar xfz $(DIR_DL)/$(mISDN_VER).tar.gz
cd $(DIR_SRC)/$(mISDN_VER) && yes 'yes' | ./std2kern -k /usr/src/linux
cd $(DIR_SRC)/mISDN.git && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-remove2.6.27-dsp-features.diff
cd $(DIR_SRC)/mISDN.git && yes 'yes' | ./std2kern -k /usr/src/linux
# Cleanup kernel source
cd $(DIR_APP) && make mrproper

14
lfs/mISDN
View File

@@ -24,9 +24,9 @@
include Config
VER = 1_1_9
VER = f69adb52764c392135800f9a87c9018f9f268139
THISAPP = mISDNuser-$(VER)
THISAPP = mISDNuser.git-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = e174a60e7040c88d1184364714e55c1b
$(DL_FILE)_MD5 = 26cd2bdaa094892c3ee30cd8fdacad8a
install : $(TARGET)
@@ -70,10 +70,10 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make MISDNDIR=/usr/src/linux
cd $(DIR_APP) && make install MISDNDIR=/usr/src/linux
cd $(DIR_SRC)/mISDNuser.git && make MISDNDIR=/usr/src/linux
cd $(DIR_SRC)/mISDNuser.git && make install MISDNDIR=/usr/src/linux
-mkdir -p /usr/lib/mISDN
cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-$(VER).tar.gz
cd $(DIR_SRC)/mISDN-$(VER) && cp -v config/*.xsl /usr/lib/mISDN
cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN.git-ad5e8abaed89ce6539104b819eef011655cd0b04.tar.gz
cd $(DIR_SRC)/mISDN.git && cp -v config/*.xsl /usr/lib/mISDN
@rm -rf $(DIR_SRC)/mISDN*
@$(POSTBUILD)

4
lfs/samba
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.3.2
VER = 3.3.3
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 5c5178ea2c5d9bd5f6569285f2e0e6d7
$(DL_FILE)_MD5 = 4d5835817416d1ffa30783af45c5a9ed
install : $(TARGET)

21
src/initscripts/init.d/cpufreq
View File

@@ -6,7 +6,7 @@
#
# Authors : Arne Fitzenreiter - arne_f@ipfire.org
#
# Version : 00.00
# Version : 01.00
#
# Notes :
#
@@ -20,14 +20,13 @@ case "${1}" in
boot_mesg -n "Starting cpufreq... "
# try cpufreq hardware depend modules
for module in acpi-cpufreq cpufreq-nforce2 e-powersaver \
gx-suspmod longhaul longrun p4-clockmod powernow-k6 \
powernow-k7 powernow-k8 speedstep-centrino speedstep-ich \
speedstep-smi; do
modprobe $module > /dev/null 2>&1;
if [ ${?} = 0 ]; then
boot_mesg -n "$SUCCESS$module$NORMAL "
fi
for i in $(find /lib/modules/$(uname -r)/kernel/arch/x86/kernel/cpu/cpufreq \
! -name speedstep-lib.ko | sort -d -r); do
module=$(basename $i | cut -d. -f1);
modprobe $module > /dev/null 2>&1;
if [ ${?} = 0 ]; then
boot_mesg -n "$SUCCESS$module$NORMAL "
fi
done
boot_mesg ""
@@ -37,7 +36,7 @@ case "${1}" in
modprobe cpufreq_powersave
modprobe cpufreq_userspace
CPUCOUNT=`ls /sys/devices/system/cpu/cpu*/cpufreq/affected_cpus | wc -l`;
CPUCOUNT=`ls /sys/devices/system/cpu/cpu*/cpufreq/affected_cpus 2> /dev/null | wc -l `;
let CPUCOUNT-=1
# Set the governor to ondemand to test if it works
cpufreq-set -g ondemand
@@ -63,3 +62,5 @@ case "${1}" in
esac
# End $rc_base/init.d/cpufreq

0
src/initscripts/init.d/miau Executable file → Normal file
View File

0
src/initscripts/init.d/net-snmp Executable file → Normal file
View File

344
src/patches/mISDN-remove2.6.27-dsp-features.diff Normal file
View File

@@ -0,0 +1,344 @@
diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_cmx.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_cmx.c
--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_cmx.c 2009-01-22 14:26:03.000000000 +0100
+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_cmx.c 2009-04-04 19:06:14.000000000 +0200
@@ -1138,11 +1138,7 @@
* also add delay if requested by PH_SIGNAL
*/
if (dsp->rx_W < 0) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
- if (dsp->features.unclocked) {
-#else
if (dsp->features.has_jitter) {
-#endif
dsp->rx_R = (hh->dinfo & CMX_BUFF_MASK);
dsp->rx_W = (dsp->rx_R+dsp->cmx_delay) & CMX_BUFF_MASK;
} else {
@@ -1151,11 +1147,7 @@
}
}
/* if frame contains time code, write directly */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
- if (dsp->features.unclocked) {
-#else
if (dsp->features.has_jitter) {
-#endif
dsp->rx_W = (hh->dinfo & CMX_BUFF_MASK);
#warning remove me
printk(KERN_DEBUG "%s %08x\n", dsp->inst.name, hh->dinfo);
diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp.h mISDN.git/drivers/isdn/hardware/mISDN/dsp.h
--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp.h 2009-01-22 14:26:03.000000000 +0100
+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp.h 2009-04-04 19:04:43.000000000 +0200
@@ -159,7 +159,6 @@
* general stuff *
*****************/
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
struct dsp_features {
int hfc_id; // unique id to identify the chip (or -1)
int hfc_dtmf; // set if HFCmulti card supports dtmf
@@ -170,7 +169,6 @@
int pcm_banks; // number of IO banks of pcm bus
int has_jitter; // data is jittered and unsorted
};
-#endif
typedef struct _dsp {
struct list_head list;
diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_hwec.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_hwec.c
--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_hwec.c 2009-01-22 14:26:03.000000000 +0100
+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_hwec.c 2009-04-04 19:07:16.000000000 +0200
@@ -30,24 +30,6 @@
#include <linux/mISDNif.h>
#include "dsp.h"
#include "helper.h"
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-static struct mISDN_dsp_element_arg args[] = {
- { "deftaps", "128", "Set the number of taps of cancellation." },
-};
-
-static struct mISDN_dsp_element dsp_hwec_p = {
- .name = "hwec",
- .new = NULL,
- .free = NULL,
- .process_tx = NULL,
- .process_rx = NULL,
- .num_args = sizeof(args) / sizeof(struct mISDN_dsp_element_arg),
- .args = args,
-};
-struct mISDN_dsp_element *dsp_hwec = &dsp_hwec_p;
-
-#else
static mISDN_dsp_element_arg_t args[] = {
{ "deftaps", "128", "Set the number of taps of cancellation." },
};
@@ -62,7 +44,6 @@
.args = args,
};
mISDN_dsp_element_t *dsp_hwec = &dsp_hwec_p;
-#endif
void dsp_hwec_enable (dsp_t *dsp, const char *arg)
{
diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_kb1ec.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_kb1ec.c
--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_kb1ec.c 2009-01-22 14:26:03.000000000 +0100
+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_kb1ec.c 2009-04-04 19:07:35.000000000 +0200
@@ -90,22 +90,6 @@
dsp_cancel_rx(p, data, len);
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-static struct mISDN_dsp_element_arg args[] = {
- { "deftaps", "128", "Set the number of taps of cancellation." },
- { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
-};
-
-static struct mISDN_dsp_element dsp_kb1ec = {
- .name = "kb1ec",
- .new = new,
- .free = free,
- .process_tx = process_tx,
- .process_rx = process_rx,
- .num_args = sizeof(args) / sizeof(struct mISDN_dsp_element_arg),
- .args = args,
-};
-#else
static mISDN_dsp_element_arg_t args[] = {
{ "deftaps", "128", "Set the number of taps of cancellation." },
{ "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
@@ -120,7 +104,6 @@
.num_args = sizeof(args) / sizeof(mISDN_dsp_element_arg_t),
.args = args,
};
-#endif
#ifdef MODULE
static int __init dsp_kb1ec_init (void)
diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_mec2.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_mec2.c
--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_mec2.c 2009-01-22 14:26:03.000000000 +0100
+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_mec2.c 2009-04-04 19:08:03.000000000 +0200
@@ -91,22 +91,6 @@
dsp_cancel_rx(p, data, len);
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-static struct mISDN_dsp_element_arg args[] = {
- { "deftaps", "128", "Set the number of taps of cancellation." },
- { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
-};
-
-static struct mISDN_dsp_element dsp_mec2 = {
- .name = "mec2",
- .new = new,
- .free = free,
- .process_tx = process_tx,
- .process_rx = process_rx,
- .num_args = sizeof(args) / sizeof(struct mISDN_dsp_element_arg),
- .args = args,
-};
-#else
static mISDN_dsp_element_arg_t args[] = {
{ "deftaps", "128", "Set the number of taps of cancellation." },
{ "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
@@ -121,7 +105,6 @@
.num_args = sizeof(args) / sizeof(mISDN_dsp_element_arg_t),
.args = args,
};
-#endif
#ifdef MODULE
static int __init dsp_mec2_init (void)
diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_mg2ec.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_mg2ec.c
--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_mg2ec.c 2009-01-22 14:26:03.000000000 +0100
+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_mg2ec.c 2009-04-04 19:08:27.000000000 +0200
@@ -90,22 +90,6 @@
dsp_cancel_rx(p, data, len);
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-static struct mISDN_dsp_element_arg args[] = {
- { "deftaps", "128", "Set the number of taps of cancellation." },
- { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
-};
-
-static struct mISDN_dsp_element dsp_mg2ec = {
- .name = "mg2ec",
- .new = new,
- .free = free,
- .process_tx = process_tx,
- .process_rx = process_rx,
- .num_args = sizeof(args) / sizeof(struct mISDN_dsp_element_arg),
- .args = args,
-};
-#else
static mISDN_dsp_element_arg_t args[] = {
{ "deftaps", "128", "Set the number of taps of cancellation." },
{ "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
@@ -120,7 +104,6 @@
.num_args = sizeof(args) / sizeof(mISDN_dsp_element_arg_t),
.args = args,
};
-#endif
#ifdef MODULE
static int __init dsp_mg2ec_init (void)
diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_octwareec.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_octwareec.c
--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_octwareec.c 2009-01-22 14:26:03.000000000 +0100
+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_octwareec.c 2009-04-04 19:09:07.000000000 +0200
@@ -91,22 +91,6 @@
dsp_cancel_rx(p, data, len);
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-static struct mISDN_dsp_element_arg args[] = {
- { "deftaps", "128", "Set the number of taps of cancellation." },
- { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
-};
-
-static struct mISDN_dsp_element dsp_octwareec = {
- .name = "octwareec",
- .new = new,
- .free = free,
- .process_tx = process_tx,
- .process_rx = process_rx,
- .num_args = sizeof(args) / sizeof(struct mISDN_dsp_element_arg),
- .args = args,
-};
-#else
static mISDN_dsp_element_arg_t args[] = {
{ "deftaps", "128", "Set the number of taps of cancellation." },
{ "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
@@ -121,7 +105,6 @@
.num_args = sizeof(args) / sizeof(mISDN_dsp_element_arg_t),
.args = args,
};
-#endif
#ifdef MODULE
static int __init dsp_octwareec_init (void)
diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_oslec.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_oslec.c
--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_oslec.c 2009-01-22 14:26:03.000000000 +0100
+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_oslec.c 2009-04-04 19:09:34.000000000 +0200
@@ -98,22 +98,6 @@
dsp_cancel_rx(p, data, len);
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-static struct mISDN_dsp_element_arg args[] = {
- { "deftaps", "128", "Set the number of taps of cancellation." },
- { "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
-};
-
-static struct mISDN_dsp_element dsp_oslec = {
- .name = "oslec",
- .new = new,
- .free = free,
- .process_tx = process_tx,
- .process_rx = process_rx,
- .num_args = sizeof(args) / sizeof(struct mISDN_dsp_element_arg),
- .args = args,
-};
-#else
static mISDN_dsp_element_arg_t args[] = {
{ "deftaps", "128", "Set the number of taps of cancellation." },
{ "training", "0", "Enable echotraining (0: disabled, 1: enabled)." },
@@ -128,7 +112,6 @@
.num_args = sizeof(args) / sizeof(mISDN_dsp_element_arg_t),
.args = args,
};
-#endif
#ifdef MODULE
static int __init dsp_oslec_init (void)
diff -Naur mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_pipeline.c mISDN.git/drivers/isdn/hardware/mISDN/dsp_pipeline.c
--- mISDN.git.org/drivers/isdn/hardware/mISDN/dsp_pipeline.c 2009-01-22 14:26:03.000000000 +0100
+++ mISDN.git/drivers/isdn/hardware/mISDN/dsp_pipeline.c 2009-04-04 19:13:05.000000000 +0200
@@ -36,11 +36,7 @@
/* uncomment for debugging */
/*#define PIPELINE_DEBUG*/
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-extern struct mISDN_dsp_element *dsp_hwec;
-#else
extern mISDN_dsp_element_t *dsp_hwec;
-#endif
extern void dsp_hwec_enable (dsp_t *dsp, const char *arg);
extern void dsp_hwec_disable (dsp_t *dsp);
@@ -48,21 +44,13 @@
extern void dsp_hwec_exit (void);
typedef struct _dsp_pipeline_entry {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
- struct mISDN_dsp_element *elem;
-#else
mISDN_dsp_element_t *elem;
-#endif
void *p;
struct list_head list;
} dsp_pipeline_entry_t;
typedef struct _dsp_element_entry {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
- struct mISDN_dsp_element *elem;
- struct device dev;
-
-#elif LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 26)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
mISDN_dsp_element_t *elem;
struct device dev;
@@ -95,11 +83,7 @@
#endif
};
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-static ssize_t attr_show_args (struct device *dev, struct device_attribute *attr, char *buf) {
- struct mISDN_dsp_element *elem = dev_get_drvdata(dev);
-
-#elif LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 26)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
static ssize_t attr_show_args (struct device *dev, struct device_attribute *attr, char *buf) {
mISDN_dsp_element_t *elem = dev_get_drvdata(dev);
@@ -125,14 +109,7 @@
return(len);
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-static struct device_attribute element_attributes[] = {
- __ATTR(args, 0444, attr_show_args, NULL),
-};
-
-int mISDN_dsp_element_register (struct mISDN_dsp_element *elem) {
-
-#elif LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 26)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
static struct device_attribute element_attributes[] = {
__ATTR(args, 0444, attr_show_args, NULL),
};
@@ -201,12 +178,7 @@
return re;
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-void mISDN_dsp_element_unregister (struct mISDN_dsp_element *elem) {
-
-#else
void mISDN_dsp_element_unregister (mISDN_dsp_element_t *elem) {
-#endif
dsp_element_entry_t *entry, *n;
u_long flags;
@@ -319,11 +291,7 @@
char *dup, *tok, *name, *args;
dsp_element_entry_t *entry, *n;
dsp_pipeline_entry_t *pipeline_entry;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
- struct mISDN_dsp_element *elem;
-#else
mISDN_dsp_element_t *elem;
-#endif
u_long elements_flags, pipeline_flags;
if (!pipeline)