diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2011-08-15 15:30:54 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2011-08-15 15:32:11 +0300 |
| commit | bc0bf19e19e4ec722cb05da08f29f8493bb6248b (patch) | |
| tree | 38b623f95752f3d18098151fb44906e75f82b45b /main/dahdi-linux-grsec/zaphfc-dahdi-2.5.0.patch | |
| parent | 11233ac93b5354d5274c88f500d702426282ae16 (diff) | |
| download | aports-bc0bf19e19e4ec722cb05da08f29f8493bb6248b.tar.bz2 aports-bc0bf19e19e4ec722cb05da08f29f8493bb6248b.tar.xz | |
main/dahdi-*: upgrade to 2.5.0
Diffstat (limited to 'main/dahdi-linux-grsec/zaphfc-dahdi-2.5.0.patch')
| -rw-r--r-- | main/dahdi-linux-grsec/zaphfc-dahdi-2.5.0.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/main/dahdi-linux-grsec/zaphfc-dahdi-2.5.0.patch b/main/dahdi-linux-grsec/zaphfc-dahdi-2.5.0.patch new file mode 100644 index 0000000000..37a1e76ba8 --- /dev/null +++ b/main/dahdi-linux-grsec/zaphfc-dahdi-2.5.0.patch @@ -0,0 +1,36 @@ +Index: dahdi-linux-2.5.0/drivers/dahdi/zaphfc.c +=================================================================== +--- dahdi-linux-2.5.0.orig/drivers/dahdi/zaphfc.c 2011-08-15 14:29:51.000000000 +0300 ++++ dahdi-linux-2.5.0/drivers/dahdi/zaphfc.c 2011-08-15 14:30:11.000000000 +0300 +@@ -616,7 +616,7 @@ + return 0; + } + +-static int zthfc_startup(struct dahdi_span *span) { ++static int zthfc_startup(struct file *file, struct dahdi_span *span) { + struct dahdi_hfc *zthfc = container_of(span, struct dahdi_hfc, span); + struct hfc_card *hfctmp = zthfc->card; + int alreadyrunning; +@@ -653,12 +653,12 @@ + return 0; + } + +-static int zthfc_chanconfig(struct dahdi_chan *chan, int sigtype) { ++static int zthfc_chanconfig(struct file *file, struct dahdi_chan *chan, int sigtype) { + // printk(KERN_CRIT "chan_config sigtype=%d\n", sigtype); + return 0; + } + +-static int zthfc_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc) { ++static int zthfc_spanconfig(struct file *file, struct dahdi_span *span, struct dahdi_lineconfig *lc) { + span->lineconfig = lc->lineconfig; + return 0; + } +@@ -699,7 +699,6 @@ + zthfc->span.deflaw = DAHDI_LAW_ALAW; + zthfc->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS; // <--- this is really BS + zthfc->span.offset = 0; +- init_waitqueue_head(&zthfc->span.maintq); + + for (i = 0; i < zthfc->span.channels; i++) { + memset(&(zthfc->chans[i]), 0x0, sizeof(struct dahdi_chan)); |