diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-13 13:25:35 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-13 13:26:53 +0000 |
| commit | c9f1e51a7c2e1cbfbb031ff42a17ab91cf478c81 (patch) | |
| tree | 91a95dbc505c5a868a1fa8275ee158d22cfa40a4 /main/dahdi-linux-grsec/zaphfc-dahdi-2.7.0.patch | |
| parent | 570801517010d34b185e5d79067557521d5618f9 (diff) | |
| download | aports-c9f1e51a7c2e1cbfbb031ff42a17ab91cf478c81.tar.bz2 aports-c9f1e51a7c2e1cbfbb031ff42a17ab91cf478c81.tar.xz | |
main/linux-dahdi-grsec: upgrade to 2.7.0.1 and fix zaphfc
ref #2337
Diffstat (limited to 'main/dahdi-linux-grsec/zaphfc-dahdi-2.7.0.patch')
| -rw-r--r-- | main/dahdi-linux-grsec/zaphfc-dahdi-2.7.0.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/main/dahdi-linux-grsec/zaphfc-dahdi-2.7.0.patch b/main/dahdi-linux-grsec/zaphfc-dahdi-2.7.0.patch new file mode 100644 index 0000000000..624cfe7b9a --- /dev/null +++ b/main/dahdi-linux-grsec/zaphfc-dahdi-2.7.0.patch @@ -0,0 +1,32 @@ +--- dahdi-linux-2.7.0/drivers/dahdi/zaphfc.c.orig 2013-11-13 14:47:31.772140792 +0200 ++++ dahdi-linux-2.7.0/drivers/dahdi/zaphfc.c 2013-11-13 14:55:20.136270113 +0200 +@@ -687,19 +687,18 @@ + if (!zthfc->ddev) + return -ENOMEM; + +- zthfc->ddev->manufacturer = "HFC"; +- ++ zthfc->ddev->manufacturer = "Cologne Chips"; ++ zthfc->ddev->devicetype = "HFC-S PCI-A ISDN"; ++ zthfc->ddev->location = kasprintf(GFP_KERNEL, ++ "PCI Bus %02d Slot %02d", ++ hfctmp->pcidev->bus->number, ++ PCI_SLOT(hfctmp->pcidev->devfn) + 1); + memset(&zthfc->span, 0x0, sizeof(struct dahdi_span)); // you never can tell... +- + sprintf(zthfc->span.name, "ZTHFC/%d", hfc_dev_count + 1); +- if (hfctmp->regs.nt_mode == 1) { +- sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [NT]", hfc_dev_count + 1); +- } else { +- sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [TE]", hfc_dev_count + 1); +- } +- ++ sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [%s]", ++ hfc_dev_count + 1, hfctmp->regs.nt_mode ? "NT" : "TE"); ++ zthfc->span.spantype = hfctmp->regs.nt_mode ? SPANTYPE_DIGITAL_BRI_NT : SPANTYPE_DIGITAL_BRI_TE; + zthfc->span.ops = &zaphfc_span_ops; +- + zthfc->span.channels = 3; + zthfc->span.chans = zthfc->_chans; + for (i = 0; i < zthfc->span.channels; i++) + |