projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/battery-2.6
[firefly-linux-kernel-4.4.55.git]
/
net
/
ax25
/
ax25_dev.c
diff --git
a/net/ax25/ax25_dev.c
b/net/ax25/ax25_dev.c
index 528c874d9828df06f6d2c880b808d31da4164041..a7a0e0c9698b0c59de7b553fdda73e947864a027 100644
(file)
--- a/
net/ax25/ax25_dev.c
+++ b/
net/ax25/ax25_dev.c
@@
-82,7
+82,7
@@
void ax25_dev_device_up(struct net_device *dev)
ax25_dev->values[AX25_VALUES_DS_TIMEOUT]= AX25_DEF_DS_TIMEOUT;
#if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER)
-
init_timer(&ax25_dev->dama.slave_timer
);
+
ax25_ds_setup_timer(ax25_dev
);
#endif
spin_lock_bh(&ax25_dev_lock);