diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:57:21 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:57:21 -0600 |
| commit | 54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch) | |
| tree | 40619a66ae6d8703a57bf681d087ffeabbffd346 /net/tipc/node.h | |
| parent | 8ce0a7df6e6117d8814e976d4b7ce6a6b2c9cf93 (diff) | |
| parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
| download | kernel-crypto-54c66f6d781e03dc0b23956234963c4911e6d1c0.tar.gz kernel-crypto-54c66f6d781e03dc0b23956234963c4911e6d1c0.tar.xz kernel-crypto-54c66f6d781e03dc0b23956234963c4911e6d1c0.zip | |
Merge branch 'master' into 85xx
Diffstat (limited to 'net/tipc/node.h')
| -rw-r--r-- | net/tipc/node.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/tipc/node.h b/net/tipc/node.h index a07cc79ea63..cd1882654bb 100644 --- a/net/tipc/node.h +++ b/net/tipc/node.h @@ -1,6 +1,6 @@ /* * net/tipc/node.h: Include file for TIPC node management routines - * + * * Copyright (c) 2000-2006, Ericsson AB * Copyright (c) 2005, Wind River Systems * All rights reserved. @@ -67,7 +67,7 @@ * @deferred_tail: newest OOS b'cast message received from node * @defragm: list of partially reassembled b'cast message fragments from node */ - + struct node { u32 addr; spinlock_t lock; @@ -85,8 +85,8 @@ struct node { int supported; u32 acked; u32 last_in; - u32 gap_after; - u32 gap_to; + u32 gap_after; + u32 gap_to; u32 nack_sync; struct sk_buff *deferred_head; struct sk_buff *deferred_tail; |