diff options
Diffstat (limited to 'net/tipc/link.c')
| -rw-r--r-- | net/tipc/link.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 2124f32ef29f..5adfdfd49d61 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * net/tipc/link.c: TIPC link code | 2 | * net/tipc/link.c: TIPC link code |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 1996-2006, Ericsson AB | 4 | * Copyright (c) 1996-2007, Ericsson AB |
| 5 | * Copyright (c) 2004-2006, Wind River Systems | 5 | * Copyright (c) 2004-2007, Wind River Systems |
| 6 | * All rights reserved. | 6 | * All rights reserved. |
| 7 | * | 7 | * |
| 8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
| @@ -1260,7 +1260,7 @@ again: | |||
| 1260 | * (Must not hold any locks while building message.) | 1260 | * (Must not hold any locks while building message.) |
| 1261 | */ | 1261 | */ |
| 1262 | 1262 | ||
| 1263 | res = msg_build(hdr, msg_sect, num_sect, sender->max_pkt, | 1263 | res = msg_build(hdr, msg_sect, num_sect, sender->publ.max_pkt, |
| 1264 | !sender->user_port, &buf); | 1264 | !sender->user_port, &buf); |
| 1265 | 1265 | ||
| 1266 | read_lock_bh(&tipc_net_lock); | 1266 | read_lock_bh(&tipc_net_lock); |
| @@ -1271,7 +1271,7 @@ again: | |||
| 1271 | if (likely(l_ptr)) { | 1271 | if (likely(l_ptr)) { |
| 1272 | if (likely(buf)) { | 1272 | if (likely(buf)) { |
| 1273 | res = link_send_buf_fast(l_ptr, buf, | 1273 | res = link_send_buf_fast(l_ptr, buf, |
| 1274 | &sender->max_pkt); | 1274 | &sender->publ.max_pkt); |
| 1275 | if (unlikely(res < 0)) | 1275 | if (unlikely(res < 0)) |
| 1276 | buf_discard(buf); | 1276 | buf_discard(buf); |
| 1277 | exit: | 1277 | exit: |
| @@ -1299,12 +1299,12 @@ exit: | |||
| 1299 | * then re-try fast path or fragment the message | 1299 | * then re-try fast path or fragment the message |
| 1300 | */ | 1300 | */ |
| 1301 | 1301 | ||
| 1302 | sender->max_pkt = link_max_pkt(l_ptr); | 1302 | sender->publ.max_pkt = link_max_pkt(l_ptr); |
| 1303 | tipc_node_unlock(node); | 1303 | tipc_node_unlock(node); |
| 1304 | read_unlock_bh(&tipc_net_lock); | 1304 | read_unlock_bh(&tipc_net_lock); |
| 1305 | 1305 | ||
| 1306 | 1306 | ||
| 1307 | if ((msg_hdr_sz(hdr) + res) <= sender->max_pkt) | 1307 | if ((msg_hdr_sz(hdr) + res) <= sender->publ.max_pkt) |
| 1308 | goto again; | 1308 | goto again; |
| 1309 | 1309 | ||
| 1310 | return link_send_sections_long(sender, msg_sect, | 1310 | return link_send_sections_long(sender, msg_sect, |
| @@ -1357,7 +1357,7 @@ static int link_send_sections_long(struct port *sender, | |||
| 1357 | 1357 | ||
| 1358 | again: | 1358 | again: |
| 1359 | fragm_no = 1; | 1359 | fragm_no = 1; |
| 1360 | max_pkt = sender->max_pkt - INT_H_SIZE; | 1360 | max_pkt = sender->publ.max_pkt - INT_H_SIZE; |
| 1361 | /* leave room for tunnel header in case of link changeover */ | 1361 | /* leave room for tunnel header in case of link changeover */ |
| 1362 | fragm_sz = max_pkt - INT_H_SIZE; | 1362 | fragm_sz = max_pkt - INT_H_SIZE; |
| 1363 | /* leave room for fragmentation header in each fragment */ | 1363 | /* leave room for fragmentation header in each fragment */ |
| @@ -1463,7 +1463,7 @@ error: | |||
| 1463 | goto reject; | 1463 | goto reject; |
| 1464 | } | 1464 | } |
| 1465 | if (link_max_pkt(l_ptr) < max_pkt) { | 1465 | if (link_max_pkt(l_ptr) < max_pkt) { |
| 1466 | sender->max_pkt = link_max_pkt(l_ptr); | 1466 | sender->publ.max_pkt = link_max_pkt(l_ptr); |
| 1467 | tipc_node_unlock(node); | 1467 | tipc_node_unlock(node); |
| 1468 | for (; buf_chain; buf_chain = buf) { | 1468 | for (; buf_chain; buf_chain = buf) { |
| 1469 | buf = buf_chain->next; | 1469 | buf = buf_chain->next; |
