projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] ppc32: Fix Kconfig mismerge
[powerpc.git]
/
net
/
sctp
/
socket.c
diff --git
a/net/sctp/socket.c
b/net/sctp/socket.c
index
aad55dc
..
91ec8c9
100644
(file)
--- a/
net/sctp/socket.c
+++ b/
net/sctp/socket.c
@@
-406,7
+406,7
@@
static int sctp_send_asconf(struct sctp_association *asoc,
* transmission.
*/
if (asoc->addip_last_asconf) {
* transmission.
*/
if (asoc->addip_last_asconf) {
-
__skb_queue_tail(&asoc->addip_chunks, (struct sk_buff *)chunk
);
+
list_add_tail(&chunk->list, &asoc->addip_chunk_list
);
goto out;
}
goto out;
}
@@
-4194,8
+4194,7
@@
out:
sctp_release_sock(sk);
return err;
cleanup:
sctp_release_sock(sk);
return err;
cleanup:
- if (tfm)
- sctp_crypto_free_tfm(tfm);
+ sctp_crypto_free_tfm(tfm);
goto out;
}
goto out;
}
@@
-4892,7
+4891,7
@@
static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
sctp_skb_for_each(skb, &oldsk->sk_receive_queue, tmp) {
event = sctp_skb2event(skb);
if (event->asoc == assoc) {
sctp_skb_for_each(skb, &oldsk->sk_receive_queue, tmp) {
event = sctp_skb2event(skb);
if (event->asoc == assoc) {
- __skb_unlink(skb,
skb->list
);
+ __skb_unlink(skb,
&oldsk->sk_receive_queue
);
__skb_queue_tail(&newsk->sk_receive_queue, skb);
}
}
__skb_queue_tail(&newsk->sk_receive_queue, skb);
}
}
@@
-4921,7
+4920,7
@@
static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
sctp_skb_for_each(skb, &oldsp->pd_lobby, tmp) {
event = sctp_skb2event(skb);
if (event->asoc == assoc) {
sctp_skb_for_each(skb, &oldsp->pd_lobby, tmp) {
event = sctp_skb2event(skb);
if (event->asoc == assoc) {
- __skb_unlink(skb,
skb->list
);
+ __skb_unlink(skb,
&oldsp->pd_lobby
);
__skb_queue_tail(queue, skb);
}
}
__skb_queue_tail(queue, skb);
}
}