Linux Headquarters - Kernel v2.6.25-rc7 /net/ax25/ax25

Kernel v2.6.25-rc7 /net/ax25/ax25_dev.c

Filename:	/net/ax25/ax25_dev.c
Lines Added:	1
Lines Deleted:	1
Also changed in:	(Previous) 2.6.25-rc6 2.6.25-rc5 2.6.25-rc4 2.6.25-rc3 2.6.25-rc2 2.6.21 (Following) 2.6.25-rc8 2.6.25-rc9 2.6.25

Location

2.6.25-rc7

net

ax25

ax25_dev.c

Patch

diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c
index 528c874..a7a0e0c 100644
--- 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);

Comments: webmaster (at) linuxhq.com.
Advertising: banners (at) linuxhq.com.
Compilation ©1998-2008 Linux Headquarters, Inc.