projects
/
lede-git
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lantiq: Make ATM and PTM drivers compatible with kernel 4.1
[lede-git/.git]
/
package
/
kernel
/
lantiq
/
ltq-ptm
/
src
/
ifxmips_ptm_adsl.c
diff --git
a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
index 615affea4f4111a0536a431ab72d7a61e7d194a1..38001c3171f95371234db3fa5a373ab34513864f 100644
(file)
--- a/
package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
+++ b/
package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
@@
-1442,7
+1442,7
@@
static int ifx_ptm_init(void)
init_tables();
for ( i = 0; i < ARRAY_SIZE(g_net_dev); i++ ) {
init_tables();
for ( i = 0; i < ARRAY_SIZE(g_net_dev); i++ ) {
- g_net_dev[i] = alloc_netdev(0, g_net_dev_name[i], ether_setup);
+ g_net_dev[i] = alloc_netdev(0, g_net_dev_name[i],
NET_NAME_UNKNOWN,
ether_setup);
if ( g_net_dev[i] == NULL )
goto ALLOC_NETDEV_FAIL;
ptm_setup(g_net_dev[i], i);
if ( g_net_dev[i] == NULL )
goto ALLOC_NETDEV_FAIL;
ptm_setup(g_net_dev[i], i);
@@
-1455,7
+1455,11
@@
static int ifx_ptm_init(void)
}
/* register interrupt handler */
}
/* register interrupt handler */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ ret = request_irq(PPE_MAILBOX_IGU1_INT, mailbox_irq_handler, 0, "ptm_mailbox_isr", &g_ptm_priv_data);
+#else
ret = request_irq(PPE_MAILBOX_IGU1_INT, mailbox_irq_handler, IRQF_DISABLED, "ptm_mailbox_isr", &g_ptm_priv_data);
ret = request_irq(PPE_MAILBOX_IGU1_INT, mailbox_irq_handler, IRQF_DISABLED, "ptm_mailbox_isr", &g_ptm_priv_data);
+#endif
if ( ret ) {
if ( ret == -EBUSY ) {
err("IRQ may be occupied by other driver, please reconfig to disable it.");
if ( ret ) {
if ( ret == -EBUSY ) {
err("IRQ may be occupied by other driver, please reconfig to disable it.");