diff options
| author | Roland McGrath <roland@gnu.org> | 2000-02-05 12:13:22 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2000-02-05 12:13:22 +0000 |
| commit | 1a7ccb577c414677f9e763036d6ccce3a298f16d (patch) | |
| tree | 10f45d0745e0f65108ecbda92ed6f7214dc703ff /pfinet/linux-src/net/ipv4/ip_masq_autofw.c | |
| parent | add1cad493c256d0a7c939070f9ee067c2718daf (diff) | |
| parent | b39cd08347c72483a4521a55301a0fa147a2a2b1 (diff) | |
Merge from vendor branch Linux:
Import of Linux 2.2.13 subset (ipv4 stack and related)
Diffstat (limited to 'pfinet/linux-src/net/ipv4/ip_masq_autofw.c')
| -rw-r--r-- | pfinet/linux-src/net/ipv4/ip_masq_autofw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pfinet/linux-src/net/ipv4/ip_masq_autofw.c b/pfinet/linux-src/net/ipv4/ip_masq_autofw.c index d2a1729c..30301441 100644 --- a/pfinet/linux-src/net/ipv4/ip_masq_autofw.c +++ b/pfinet/linux-src/net/ipv4/ip_masq_autofw.c @@ -2,7 +2,7 @@ * IP_MASQ_AUTOFW auto forwarding module * * - * $Id: ip_masq_autofw.c,v 1.3 1998/08/29 23:51:10 davem Exp $ + * $Id: ip_masq_autofw.c,v 1.3.2.1 1999/08/13 18:26:20 davem Exp $ * * Author: Richard Lynch * @@ -179,13 +179,13 @@ static __inline__ int ip_autofw_add(struct ip_autofw_user * af) { struct ip_autofw * newaf; newaf = kmalloc( sizeof(struct ip_autofw), GFP_KERNEL ); - init_timer(&newaf->timer); if ( newaf == NULL ) { printk("ip_autofw_add: malloc said no\n"); return( ENOMEM ); } + init_timer(&newaf->timer); MOD_INC_USE_COUNT; memcpy(newaf, af, sizeof(struct ip_autofw_user)); |