diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-09-09 21:36:13 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-09-09 21:36:13 -0400 |
| commit | 7e392f8c29ee045c6a29d50193d2fb10712eceb0 (patch) | |
| tree | c84097fe644c50c82f087ab7fa2d75167b8c0e16 /net/tipc/link.h | |
| parent | 7713fef06517d216f96ee7c8ad750e72bc08d38f (diff) | |
| parent | 93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'net/tipc/link.h')
| -rw-r--r-- | net/tipc/link.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/link.h b/net/tipc/link.h index 52f3e7c1871f..6a51e38ad25c 100644 --- a/net/tipc/link.h +++ b/net/tipc/link.h | |||
| @@ -116,7 +116,7 @@ struct link { | |||
| 116 | char name[TIPC_MAX_LINK_NAME]; | 116 | char name[TIPC_MAX_LINK_NAME]; |
| 117 | struct tipc_media_addr media_addr; | 117 | struct tipc_media_addr media_addr; |
| 118 | struct timer_list timer; | 118 | struct timer_list timer; |
| 119 | struct node *owner; | 119 | struct tipc_node *owner; |
| 120 | struct list_head link_list; | 120 | struct list_head link_list; |
| 121 | 121 | ||
| 122 | /* Management and link supervision data */ | 122 | /* Management and link supervision data */ |