Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits)
  netxen: update copyright
  netxen: fix tx timeout recovery
  netxen: fix file firmware leak
  netxen: improve pci memory access
  netxen: change firmware write size
  tg3: Fix return ring size breakage
  netxen: build fix for INET=n
  cdc-phonet: autoconfigure Phonet address
  Phonet: back-end for autoconfigured addresses
  Phonet: fix netlink address dump error handling
  ipv6: Add IFA_F_DADFAILED flag
  net: Add DEVTYPE support for Ethernet based devices
  mv643xx_eth.c: remove unused txq_set_wrr()
  ucc_geth: Fix hangs after switching from full to half duplex
  ucc_geth: Rearrange some code to avoid forward declarations
  phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs
  drivers/net/phy: introduce missing kfree
  drivers/net/wan: introduce missing kfree
  net: force bridge module(s) to be GPL
  Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded
  ...

Fixed up trivial conflicts:

 - arch/x86/include/asm/socket.h

   converted to <asm-generic/socket.h> in the x86 tree.  The generic
   header has the same new #define's, so that works out fine.

 - drivers/net/tun.c

   fix conflict between 89f56d1e9 ("tun: reuse struct sock fields") that
   switched over to using 'tun->socket.sk' instead of the redundantly
   available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks
   to the TUN driver") which added a new 'tun->sk' use.

   Noted in 'next' by Stephen Rothwell.

1 files changed, 18 insertions, 20 deletions

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 971890dbfea0..89af37a6c871 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -1361,6 +1361,7 @@ SCTP_STATIC void sctp_close(struct sock *sk, long timeout)
 
         sctp_lock_sock(sk);
         sk->sk_shutdown = SHUTDOWN_MASK;
+        sk->sk_state = SCTP_SS_CLOSING;
 
         ep = sctp_sk(sk)->ep;
 
@@ -1813,20 +1814,22 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
                 sctp_set_owner_w(chunk);
 
                 chunk->transport = chunk_tp;
-
-                /* Send it to the lower layers.  Note:  all chunks
-                 * must either fail or succeed.   The lower layer
-                 * works that way today.  Keep it that way or this
-                 * breaks.
-                 */
-                err = sctp_primitive_SEND(asoc, chunk);
-                /* Did the lower layer accept the chunk? */
-                if (err)
-                        sctp_chunk_free(chunk);
-                SCTP_DEBUG_PRINTK("We sent primitively.\n");
         }
 
-        sctp_datamsg_put(datamsg);
+        /* Send it to the lower layers.  Note:  all chunks
+         * must either fail or succeed.   The lower layer
+         * works that way today.  Keep it that way or this
+         * breaks.
+         */
+        err = sctp_primitive_SEND(asoc, datamsg);
+        /* Did the lower layer accept the chunk? */
+        if (err)
+                sctp_datamsg_free(datamsg);
+        else
+                sctp_datamsg_put(datamsg);
+
+        SCTP_DEBUG_PRINTK("We sent primitively.\n");
+
         if (err)
                 goto out_free;
         else
@@ -2240,7 +2243,7 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,
                         sctp_assoc_sync_pmtu(asoc);
                 } else if (asoc) {
                         asoc->pathmtu = params->spp_pathmtu;
-                        sctp_frag_point(sp, params->spp_pathmtu);
+                        sctp_frag_point(asoc, params->spp_pathmtu);
                 } else {
                         sp->pathmtu = params->spp_pathmtu;
                 }
@@ -2877,15 +2880,10 @@ static int sctp_setsockopt_maxseg(struct sock *sk, char __user *optval, int optl
                         val -= sizeof(struct sctphdr) +
                                         sizeof(struct sctp_data_chunk);
                 }
-
-                asoc->frag_point = val;
+                asoc->user_frag = val;
+                asoc->frag_point = sctp_frag_point(asoc, asoc->pathmtu);
         } else {
                 sp->user_frag = val;
-
-                /* Update the frag_point of the existing associations. */
-                list_for_each_entry(asoc, &(sp->ep->asocs), asocs) {
-                        asoc->frag_point = sctp_frag_point(sp, asoc->pathmtu);
-                }
         }
 
         return 0;