diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/tipc/discover.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/tipc/discover.c')
| -rw-r--r-- | net/tipc/discover.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/tipc/discover.c b/net/tipc/discover.c index 53ba4630c10d..92601385e5f5 100644 --- a/net/tipc/discover.c +++ b/net/tipc/discover.c | |||
| @@ -110,10 +110,10 @@ void tipc_disc_link_event(u32 addr, char *name, int up) | |||
| 110 | * @b_ptr: ptr to bearer issuing message | 110 | * @b_ptr: ptr to bearer issuing message |
| 111 | */ | 111 | */ |
| 112 | 112 | ||
| 113 | struct sk_buff *tipc_disc_init_msg(u32 type, | 113 | static struct sk_buff *tipc_disc_init_msg(u32 type, |
| 114 | u32 req_links, | 114 | u32 req_links, |
| 115 | u32 dest_domain, | 115 | u32 dest_domain, |
| 116 | struct bearer *b_ptr) | 116 | struct bearer *b_ptr) |
| 117 | { | 117 | { |
| 118 | struct sk_buff *buf = buf_acquire(DSC_H_SIZE); | 118 | struct sk_buff *buf = buf_acquire(DSC_H_SIZE); |
| 119 | struct tipc_msg *msg; | 119 | struct tipc_msg *msg; |