[SCTP] Fix merge conflicts.

include/net/sctp/sctp.h

@@ -168,7 +168,7 @@ extern void sctp_unhash_endpoint(sctp_endpoint_t *);
 extern void __sctp_unhash_endpoint(sctp_endpoint_t *);
 extern sctp_association_t *__sctp_lookup_association(const union sctp_addr *,
 						     const union sctp_addr *,
-						     sctp_transport_t **);
+						     struct sctp_transport **);
 
 /*
  * sctp_hashdriver.c

include/net/sctp/structs.h

@@ -940,7 +940,8 @@ int sctp_outq_set_output_handlers(struct sctp_outq *,
 				  sctp_outq_ohandler_t build,
 				  sctp_outq_ohandler_force_t force);
 void sctp_outq_restart(struct sctp_outq *);
-void sctp_retransmit(struct sctp_outq *, struct sctp_transport *, __u8);
+void sctp_retransmit(struct sctp_outq *, struct sctp_transport *, 
+		     sctp_retransmit_reason_t);
 void sctp_retransmit_mark(struct sctp_outq *, struct sctp_transport *, __u8);
 
 

net/sctp/associola.c

@@ -954,7 +954,7 @@ struct sctp_transport *sctp_assoc_choose_shutdown_transport(sctp_association_t *
  */
 void sctp_assoc_sync_pmtu(sctp_association_t *asoc)
 {
-	sctp_transport_t *t;
+	struct sctp_transport *t;
 	struct list_head *pos;
 	__u32 pmtu = 0;
 
@@ -963,7 +963,7 @@ void sctp_assoc_sync_pmtu(sctp_association_t *asoc)
 
 	/* Get the lowest pmtu of all the transports. */
 	list_for_each(pos, &asoc->peer.transport_addr_list) {
-		t = list_entry(pos, sctp_transport_t, transports);
+		t = list_entry(pos, struct sctp_transport, transports);
 		if (!pmtu || (t->pmtu < pmtu))
 			pmtu = t->pmtu;
 	}

net/sctp/input.c

@@ -259,7 +259,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb)
 /* Handle icmp frag needed error. */
 static inline void sctp_icmp_frag_needed(struct sock *sk,
 					 sctp_association_t *asoc,
-					 sctp_transport_t *transport,
+					 struct sctp_transport *transport,
 					 __u32 pmtu)
 {
 	if (!sock_owned_by_user(sk) && transport && (transport->pmtu != pmtu)) {
@@ -296,7 +296,7 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info)
 	struct sock *sk = NULL;
 	sctp_endpoint_t *ep = NULL;
 	sctp_association_t *asoc = NULL;
-	sctp_transport_t *transport;
+	struct sctp_transport *transport;
 	int err;
 
 	if (skb->len < ((iph->ihl << 2) + 8)) {