From e24a400c61c3e3c711dab6d60643992b7c42ff23 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 20 Nov 2006 17:09:01 -0800 Subject: [PATCH] --- yaml --- r: 41816 b: refs/heads/master c: f235fca389f23cd6c9e0f466611bb2d6a05ae758 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sctp/input.c | 2 +- trunk/net/sctp/sm_make_chunk.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d5c15b4c4641..af441cd466f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2fccedb0136205d02e97a41851503e2b96d2a17 +refs/heads/master: f235fca389f23cd6c9e0f466611bb2d6a05ae758 diff --git a/trunk/net/sctp/input.c b/trunk/net/sctp/input.c index 85b3441c4a23..0e5ac5e42c96 100644 --- a/trunk/net/sctp/input.c +++ b/trunk/net/sctp/input.c @@ -245,7 +245,7 @@ int sctp_rcv(struct sk_buff *skb) chunk->sctp_hdr = sh; /* Set the source and destination addresses of the incoming chunk. */ - sctp_init_addrs(chunk, &src, &dest); + sctp_init_addrs(chunk, &tmp2, &tmp); /* Remember where we came from. */ chunk->transport = transport; diff --git a/trunk/net/sctp/sm_make_chunk.c b/trunk/net/sctp/sm_make_chunk.c index cb8cecd85a2e..b5d4a61ed7a7 100644 --- a/trunk/net/sctp/sm_make_chunk.c +++ b/trunk/net/sctp/sm_make_chunk.c @@ -1031,9 +1031,9 @@ struct sctp_chunk *sctp_chunkify(struct sk_buff *skb, void sctp_init_addrs(struct sctp_chunk *chunk, union sctp_addr *src, union sctp_addr *dest) { - memcpy(&chunk->source_h, src, sizeof(union sctp_addr)); - flip_to_n(&chunk->source, &chunk->source_h); - memcpy(&chunk->dest, dest, sizeof(union sctp_addr)); + memcpy(&chunk->source, src, sizeof(union sctp_addr)); + flip_to_h(&chunk->source_h, &chunk->source); + flip_to_h(&chunk->dest, dest); } /* Extract the source address from a chunk. */