diff -u zaphfc/base.c /home/mylab/src/dahdi-linux-2.2.0-rc2/drivers/dahdi/vzaphfc/base.c
--- zaphfc/base.c 2009-04-15 02:00:10.000000000 +0200
+++ /home/mylab/src/dahdi-linux-2.2.0-rc2/drivers/dahdi/vzaphfc/base.c 2009-05-05 18:50:20.266641241 +0200
@@ -48,6 +48,10 @@
#define B1 1
#define B2 2
+#define FALSE 0
+#define TRUE (!FALSE)
+
+
static int modes = 0; // all TE
static int nt_modes[hfc_MAX_BOARDS];
static int nt_modes_count;
@@ -1594,7 +1598,7 @@
memset(chan->netdev->dev_addr, 0x00, sizeof(chan->netdev->dev_addr));
- SET_MODULE_OWNER(chan->netdev);
+ //SET_MODULE_OWNER(chan->netdev);
}
static int __devinit hfc_probe(struct pci_dev *pci_dev,
@@ -1691,7 +1695,7 @@
pci_write_config_dword(card->pcidev, hfc_PCI_MWBA, card->fifo_bus_mem);
if ((err = request_irq(card->pcidev->irq, &hfc_interrupt,
- SA_SHIRQ, hfc_DRIVER_NAME, card))) {
+ IRQF_SHARED, hfc_DRIVER_NAME, card))) {
printk(KERN_CRIT hfc_DRIVER_PREFIX
"card %d: "
"unable to register irq\n",
@@ -1993,9 +1997,9 @@
printk(KERN_INFO hfc_DRIVER_PREFIX
hfc_DRIVER_STRING " loading\n");
- hfc_proc_zaphfc_dir = proc_mkdir(hfc_DRIVER_NAME, proc_root_driver);
+ hfc_proc_zaphfc_dir = proc_mkdir("driver/vzaphfc", NULL);
- ret = pci_module_init(&hfc_driver);
+ ret = pci_register_driver(&hfc_driver);
return ret;
}
@@ -2005,7 +2009,7 @@
{
pci_unregister_driver(&hfc_driver);
- remove_proc_entry(hfc_DRIVER_NAME, proc_root_driver);
+ remove_proc_entry("driver/vzaphfc", NULL);
printk(KERN_INFO hfc_DRIVER_PREFIX
hfc_DRIVER_STRING " unloaded\n");
diff -u zaphfc/lapd.c /home/mylab/src/dahdi-linux-2.2.0-rc2/drivers/dahdi/vzaphfc/lapd.c
--- zaphfc/lapd.c 2009-04-14 12:36:26.000000000 +0200
+++ /home/mylab/src/dahdi-linux-2.2.0-rc2/drivers/dahdi/vzaphfc/lapd.c 2009-05-05 19:11:32.503479401 +0200
@@ -25,11 +25,7 @@
{
netdev->change_mtu = lapd_change_mtu;
- netdev->hard_header = NULL;
- netdev->rebuild_header = NULL;
netdev->set_mac_address = lapd_mac_addr;
- netdev->hard_header_cache = NULL;
- netdev->header_cache_update= NULL;
netdev->type = ARPHRD_LAPD;
netdev->hard_header_len = 0;