Messages in this thread Patch in this message | | | Date | Mon, 28 Jul 2003 21:04:27 +0200 | From | Francois Romieu <> | Subject | [PATCH] 2.6.0-test2 - HDLC hook update for drivers/net/wan/dscc4 |
| |
- ChangeSet 1.1525, 2003/07/25 15:24:04-07:00, khc@pm.waw.pl [...] - protocol hooks are slighty changed to allow zeroing (memset).
make: *** [drivers] Error 2 drivers/net/wan/dscc4.c: In function `dscc4_found1': drivers/net/wan/dscc4.c:891: incompatible types in assignment [...] -> dscc4 module doesn't set hdlc->proto(.id) itself anymore. - MOD_{INC/DEC}_USE_COUNT removal; - SET_NETDEV_DEV() use;
drivers/net/wan/dscc4.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
diff -puN drivers/net/wan/dscc4.c~drivers-hooks-changed-dscc4 drivers/net/wan/dscc4.c --- linux-2.6.0-test2/drivers/net/wan/dscc4.c~drivers-hooks-changed-dscc4 Mon Jul 28 20:35:32 2003 +++ linux-2.6.0-test2-fr/drivers/net/wan/dscc4.c Mon Jul 28 20:46:52 2003 @@ -876,6 +876,8 @@ static int dscc4_found1(struct pci_dev * d->do_ioctl = dscc4_ioctl; d->tx_timeout = dscc4_tx_timeout; d->watchdog_timeo = TX_TIMEOUT; + SET_MODULE_OWNER(d); + SET_NETDEV_DEV(d, &pdev->dev); dpriv->dev_id = i; dpriv->pci_priv = ppriv; @@ -888,8 +890,7 @@ static int dscc4_found1(struct pci_dev * printk(KERN_ERR "%s: unable to register\n", DRV_NAME); goto err_unregister; } - hdlc->proto = IF_PROTO_HDLC; - SET_MODULE_OWNER(d); + dscc4_init_registers(dpriv, d); dpriv->parity = PARITY_CRC16_PR0_CCITT; dpriv->encoding = ENCODING_NRZ; @@ -955,8 +956,6 @@ static int dscc4_open(struct net_device if ((ret = hdlc_open(hdlc))) goto err; - MOD_INC_USE_COUNT; - ppriv = dpriv->pci_priv; if ((ret = dscc4_init_ring(dev))) @@ -1015,7 +1014,6 @@ err_free_ring: dscc4_release_ring(dpriv); err_out: hdlc_close(hdlc); - MOD_DEC_USE_COUNT; err: return ret; } _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |