diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-11-03 10:51:26 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-03 10:51:26 -0400 |
| commit | 69dbdd819599e2f3b77c172e83af512845bca5ad (patch) | |
| tree | 49939d8b80ec2115a801eae2aebc21f23867c876 /net/tipc/msg.c | |
| parent | 87232dd49aeb6b7d1af291edca8bd129a82ef4b5 (diff) | |
| parent | 75e3f3137cb570661c2ad3035a139dda671fbb63 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'net/tipc/msg.c')
| -rw-r--r-- | net/tipc/msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/msg.c b/net/tipc/msg.c index 381063817b41..ecb532fb0351 100644 --- a/net/tipc/msg.c +++ b/net/tipc/msg.c | |||
| @@ -112,7 +112,7 @@ int tipc_msg_build(struct tipc_msg *hdr, | |||
| 112 | return dsz; | 112 | return dsz; |
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | *buf = buf_acquire(sz); | 115 | *buf = tipc_buf_acquire(sz); |
| 116 | if (!(*buf)) | 116 | if (!(*buf)) |
| 117 | return -ENOMEM; | 117 | return -ENOMEM; |
| 118 | skb_copy_to_linear_data(*buf, hdr, hsz); | 118 | skb_copy_to_linear_data(*buf, hdr, hsz); |