Hand merge.

diff --cc include/net/sctp/sctp.h
Simple merge

diff --cc net/sctp/associola.c
Simple merge

diff --cc net/sctp/input.c
Simple merge

diff --cc net/sctp/ipv6.c
Simple merge

diff --cc net/sctp/protocol.c
Simple merge

diff --cc net/sctp/sm_make_chunk.c
Simple merge

diff --cc net/sctp/sm_sideeffect.c
Simple merge

diff --cc net/sctp/sm_statefuns.c
Simple merge

diff --cc net/sctp/socket.c
index 7d0d2bb912c22f533c4e15941b02b39acde9f58a,682f25dbfc85f2ccdebbf7ff1c8be92288c0755c..f5f0f022994aeb201476f288ec179fa6569bf63c
--- 1/net/sctp/socket.c
--- 2/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@@ -710,10 -742,10 +742,10 @@@ SCTP_STATIC void sctp_close(struct soc
        struct sctp_association *asoc;
        struct list_head *pos, *temp;
  
-       printk("sctp_close(sk: 0x%p, timeout:%ld)\n", sk, timeout);
+       SCTP_DEBUG_PRINTK("sctp_close(sk: 0x%p, timeout:%ld)\n", sk, timeout);
  
        sctp_lock_sock(sk);
 -      sk->shutdown = SHUTDOWN_MASK;
 +      sk->sk_shutdown = SHUTDOWN_MASK;
  
        ep = sctp_sk(sk)->ep;
  
@@@ -3127,24 -3347,18 +3347,18 @@@ static void sctp_bucket_destroy(struct 
  /* FIXME: Comments! */
  static __inline__ void __sctp_put_port(struct sock *sk)
  {
-       struct sctp_protocol *sctp_proto = sctp_get_protocol();
-       sctp_bind_hashbucket_t *head =
-               &sctp_proto->port_hashtable[sctp_phashfn(inet_sk(sk)->num)];
-       sctp_bind_bucket_t *pp;
+       struct sctp_bind_hashbucket *head =
+               &sctp_port_hashtable[sctp_phashfn(inet_sk(sk)->num)];
+       struct sctp_bind_bucket *pp;
  
        sctp_spin_lock(&head->lock);
-       pp = (sctp_bind_bucket_t *)sk->sk_prev;
 -      pp = (struct sctp_bind_bucket *) sk->prev;
 -      if (sk->bind_next)
 -              sk->bind_next->bind_pprev = sk->bind_pprev;
 -      *(sk->bind_pprev) = sk->bind_next;
 -      sk->prev = NULL;
++      pp = (struct sctp_bind_bucket *)sk->sk_prev;
 +      if (sk->sk_bind_next)
 +              sk->sk_bind_next->sk_bind_pprev = sk->sk_bind_pprev;
 +      *(sk->sk_bind_pprev) = sk->sk_bind_next;
 +      sk->sk_prev = NULL;
        inet_sk(sk)->num = 0;
-       if (pp->sk) {
-               if (pp->next)
-                       pp->next->pprev = pp->pprev;
-               *(pp->pprev) = pp->next;
-               kfree(pp);
-       }
+       sctp_bucket_destroy(pp);
        sctp_spin_unlock(&head->lock);
  }
  

diff --cc net/sctp/transport.c
Simple merge