diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-13 18:49:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-13 18:49:11 -0700 |
| commit | 27b61ae2d73936554fcd07e77c3cc13bc88c41a9 (patch) | |
| tree | 12f589c6a4671bf7f08045bb11059514f47bb924 /net/tipc/link.h | |
| parent | 46af31800b6916c92fffa529dc3c357008da957d (diff) | |
| parent | 633d2bdedc3b81f202bda8fdad17aeb08809b7df (diff) | |
| download | kernel_samsung_smdk4412-27b61ae2d73936554fcd07e77c3cc13bc88c41a9.zip kernel_samsung_smdk4412-27b61ae2d73936554fcd07e77c3cc13bc88c41a9.tar.gz kernel_samsung_smdk4412-27b61ae2d73936554fcd07e77c3cc13bc88c41a9.tar.bz2 | |
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 a7794e7..e6a30db 100644 --- a/net/tipc/link.h +++ b/net/tipc/link.h @@ -207,7 +207,8 @@ struct link { struct tipc_port; -struct link *tipc_link_create(struct tipc_bearer *b_ptr, const u32 peer, +struct link *tipc_link_create(struct tipc_node *n_ptr, + struct tipc_bearer *b_ptr, const struct tipc_media_addr *media_addr); void tipc_link_delete(struct link *l_ptr); void tipc_link_changeover(struct link *l_ptr); |