diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-13 21:49:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-13 21:49:11 -0400 |
| commit | 27b61ae2d73936554fcd07e77c3cc13bc88c41a9 (patch) | |
| tree | 12f589c6a4671bf7f08045bb11059514f47bb924 /net/tipc/link.h | |
| parent | 46af31800b6916c92fffa529dc3c357008da957d (diff) | |
| parent | 633d2bdedc3b81f202bda8fdad17aeb08809b7df (diff) | |
Merge branch 'tipc-Mar13-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6
Diffstat (limited to 'net/tipc/link.h')
| -rw-r--r-- | net/tipc/link.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tipc/link.h b/net/tipc/link.h index a7794e7ede29..e6a30dbe1aaa 100644 --- a/net/tipc/link.h +++ b/net/tipc/link.h | |||
| @@ -207,7 +207,8 @@ struct link { | |||
| 207 | 207 | ||
| 208 | struct tipc_port; | 208 | struct tipc_port; |
| 209 | 209 | ||
| 210 | struct link *tipc_link_create(struct tipc_bearer *b_ptr, const u32 peer, | 210 | struct link *tipc_link_create(struct tipc_node *n_ptr, |
| 211 | struct tipc_bearer *b_ptr, | ||
| 211 | const struct tipc_media_addr *media_addr); | 212 | const struct tipc_media_addr *media_addr); |
| 212 | void tipc_link_delete(struct link *l_ptr); | 213 | void tipc_link_delete(struct link *l_ptr); |
| 213 | void tipc_link_changeover(struct link *l_ptr); | 214 | void tipc_link_changeover(struct link *l_ptr); |