diff options
Diffstat (limited to 'net/tipc/config.c')
-rw-r--r-- | net/tipc/config.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/tipc/config.c b/net/tipc/config.c index baf55c459c8b..14789a82de53 100644 --- a/net/tipc/config.c +++ b/net/tipc/config.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * net/tipc/config.c: TIPC configuration management code | 2 | * net/tipc/config.c: TIPC configuration management code |
3 | * | 3 | * |
4 | * Copyright (c) 2002-2006, Ericsson AB | 4 | * Copyright (c) 2002-2006, Ericsson AB |
5 | * Copyright (c) 2004-2006, Wind River Systems | 5 | * Copyright (c) 2004-2006, Wind River Systems |
6 | * All rights reserved. | 6 | * All rights reserved. |
@@ -86,7 +86,7 @@ struct sk_buff *tipc_cfg_reply_alloc(int payload_size) | |||
86 | return buf; | 86 | return buf; |
87 | } | 87 | } |
88 | 88 | ||
89 | int tipc_cfg_append_tlv(struct sk_buff *buf, int tlv_type, | 89 | int tipc_cfg_append_tlv(struct sk_buff *buf, int tlv_type, |
90 | void *tlv_data, int tlv_data_size) | 90 | void *tlv_data, int tlv_data_size) |
91 | { | 91 | { |
92 | struct tlv_desc *tlv = (struct tlv_desc *)buf->tail; | 92 | struct tlv_desc *tlv = (struct tlv_desc *)buf->tail; |
@@ -112,7 +112,7 @@ struct sk_buff *tipc_cfg_reply_unsigned_type(u16 tlv_type, u32 value) | |||
112 | buf = tipc_cfg_reply_alloc(TLV_SPACE(sizeof(value))); | 112 | buf = tipc_cfg_reply_alloc(TLV_SPACE(sizeof(value))); |
113 | if (buf) { | 113 | if (buf) { |
114 | value_net = htonl(value); | 114 | value_net = htonl(value); |
115 | tipc_cfg_append_tlv(buf, tlv_type, &value_net, | 115 | tipc_cfg_append_tlv(buf, tlv_type, &value_net, |
116 | sizeof(value_net)); | 116 | sizeof(value_net)); |
117 | } | 117 | } |
118 | return buf; | 118 | return buf; |
@@ -182,7 +182,7 @@ int tipc_cfg_cmd(const struct tipc_cmd_msg * msg, | |||
182 | 182 | ||
183 | static void cfg_cmd_event(struct tipc_cmd_msg *msg, | 183 | static void cfg_cmd_event(struct tipc_cmd_msg *msg, |
184 | char *data, | 184 | char *data, |
185 | u32 sz, | 185 | u32 sz, |
186 | struct tipc_portid const *orig) | 186 | struct tipc_portid const *orig) |
187 | { | 187 | { |
188 | int rv = -EINVAL; | 188 | int rv = -EINVAL; |
@@ -192,7 +192,7 @@ static void cfg_cmd_event(struct tipc_cmd_msg *msg, | |||
192 | 192 | ||
193 | msg->cmd = ntohl(msg->cmd); | 193 | msg->cmd = ntohl(msg->cmd); |
194 | 194 | ||
195 | cfg_prepare_res_msg(msg->cmd, msg->usr_handle, rv, &rmsg, msg_sect, | 195 | cfg_prepare_res_msg(msg->cmd, msg->usr_handle, rv, &rmsg, msg_sect, |
196 | data, 0); | 196 | data, 0); |
197 | if (ntohl(msg->magic) != TIPC_MAGIC) | 197 | if (ntohl(msg->magic) != TIPC_MAGIC) |
198 | goto exit; | 198 | goto exit; |
@@ -295,7 +295,7 @@ static struct sk_buff *cfg_set_own_addr(void) | |||
295 | " (cannot change node address once assigned)"); | 295 | " (cannot change node address once assigned)"); |
296 | tipc_own_addr = addr; | 296 | tipc_own_addr = addr; |
297 | 297 | ||
298 | /* | 298 | /* |
299 | * Must release all spinlocks before calling start_net() because | 299 | * Must release all spinlocks before calling start_net() because |
300 | * Linux version of TIPC calls eth_media_start() which calls | 300 | * Linux version of TIPC calls eth_media_start() which calls |
301 | * register_netdevice_notifier() which may block! | 301 | * register_netdevice_notifier() which may block! |
@@ -619,7 +619,7 @@ static void cfg_named_msg_event(void *userdata, | |||
619 | struct sk_buff **buf, | 619 | struct sk_buff **buf, |
620 | const unchar *msg, | 620 | const unchar *msg, |
621 | u32 size, | 621 | u32 size, |
622 | u32 importance, | 622 | u32 importance, |
623 | struct tipc_portid const *orig, | 623 | struct tipc_portid const *orig, |
624 | struct tipc_name_seq const *dest) | 624 | struct tipc_name_seq const *dest) |
625 | { | 625 | { |
@@ -640,7 +640,7 @@ static void cfg_named_msg_event(void *userdata, | |||
640 | /* Generate reply for request (if can't, return request) */ | 640 | /* Generate reply for request (if can't, return request) */ |
641 | 641 | ||
642 | rep_buf = tipc_cfg_do_cmd(orig->node, | 642 | rep_buf = tipc_cfg_do_cmd(orig->node, |
643 | ntohs(req_hdr->tcm_type), | 643 | ntohs(req_hdr->tcm_type), |
644 | msg + sizeof(*req_hdr), | 644 | msg + sizeof(*req_hdr), |
645 | size - sizeof(*req_hdr), | 645 | size - sizeof(*req_hdr), |
646 | BUF_HEADROOM + MAX_H_SIZE + sizeof(*rep_hdr)); | 646 | BUF_HEADROOM + MAX_H_SIZE + sizeof(*rep_hdr)); |