Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 41819
b: refs/heads/master
c: b488c7d
h: refs/heads/master
i:
  41817: 65d47c2
  41815: 1efff23
v: v3
  • Loading branch information
Al Viro authored and David S. Miller committed Dec 3, 2006
1 parent 7fd11ee commit 58edde5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d55c41b115e74b30a3d1a61db806bd03bdd9dd6f
refs/heads/master: b488c7dd58f61e07b54e5d286c7b45c43dd52f1a
2 changes: 1 addition & 1 deletion trunk/net/sctp/associola.c
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
return peer;
}

peer = sctp_transport_new(addr, gfp);
peer = sctp_transport_new(&tmp, gfp);
if (!peer)
return NULL;

Expand Down
4 changes: 3 additions & 1 deletion trunk/net/sctp/sm_statefuns.c
Original file line number Diff line number Diff line change
Expand Up @@ -5105,6 +5105,7 @@ static struct sctp_packet *sctp_ootb_pkt_new(const struct sctp_association *asoc
__u16 sport;
__u16 dport;
__u32 vtag;
union sctp_addr tmp;

/* Get the source and destination port from the inbound packet. */
sport = ntohs(chunk->sctp_hdr->dest);
Expand Down Expand Up @@ -5135,7 +5136,8 @@ static struct sctp_packet *sctp_ootb_pkt_new(const struct sctp_association *asoc
}

/* Make a transport for the bucket, Eliza... */
transport = sctp_transport_new(sctp_source(chunk), GFP_ATOMIC);
flip_to_n(&tmp, sctp_source(chunk));
transport = sctp_transport_new(&tmp, GFP_ATOMIC);
if (!transport)
goto nomem;

Expand Down
4 changes: 2 additions & 2 deletions trunk/net/sctp/transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer,
gfp_t gfp)
{
/* Copy in the address. */
peer->ipaddr_h = *addr;
flip_to_n(&peer->ipaddr, &peer->ipaddr_h);
peer->ipaddr = *addr;
flip_to_h(&peer->ipaddr_h, &peer->ipaddr);
peer->af_specific = sctp_get_af_specific(addr->sa.sa_family);
peer->asoc = NULL;

Expand Down

0 comments on commit 58edde5

Please sign in to comment.