diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
| commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
| tree | ea409366a5208aced495bc0516a08b81fd43222e /net/tipc/port.h | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'net/tipc/port.h')
| -rw-r--r-- | net/tipc/port.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/port.h b/net/tipc/port.h index b9aa34195aec..f751807e2a91 100644 --- a/net/tipc/port.h +++ b/net/tipc/port.h | |||
| @@ -151,7 +151,7 @@ struct tipc_port { | |||
| 151 | }; | 151 | }; |
| 152 | 152 | ||
| 153 | extern spinlock_t tipc_port_list_lock; | 153 | extern spinlock_t tipc_port_list_lock; |
| 154 | struct port_list; | 154 | struct tipc_port_list; |
| 155 | 155 | ||
| 156 | /* | 156 | /* |
| 157 | * TIPC port manipulation routines | 157 | * TIPC port manipulation routines |
| @@ -228,7 +228,7 @@ int tipc_port_reject_sections(struct tipc_port *p_ptr, struct tipc_msg *hdr, | |||
| 228 | unsigned int total_len, int err); | 228 | unsigned int total_len, int err); |
| 229 | struct sk_buff *tipc_port_get_ports(void); | 229 | struct sk_buff *tipc_port_get_ports(void); |
| 230 | void tipc_port_recv_proto_msg(struct sk_buff *buf); | 230 | void tipc_port_recv_proto_msg(struct sk_buff *buf); |
| 231 | void tipc_port_recv_mcast(struct sk_buff *buf, struct port_list *dp); | 231 | void tipc_port_recv_mcast(struct sk_buff *buf, struct tipc_port_list *dp); |
| 232 | void tipc_port_reinit(void); | 232 | void tipc_port_reinit(void); |
| 233 | 233 | ||
| 234 | /** | 234 | /** |