Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/isdn/i4l/isdn_net.c
	fs/cifs/connect.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/hw/nes/nes.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_main.c
Simple merge

diff --cc drivers/isdn/i4l/isdn_net.c
index 8fff0bd100a83d8ae84f40bfea215d52e8a14d56,1bfc55d7a26c745d226f840edcfd784dd6930985..ad17a47ecc060d832a4cab896e94ce653f484925
--- 1/drivers/isdn/i4l/isdn_net.c
--- 2/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@@ -1636,11 -1640,12 +1636,11 @@@ isdn_net_ciscohdlck_slarp_send_reply(is
  
        /* slarp reply, send own ip/netmask; if values are nonsense remote
         * should think we are unable to provide it with an address via SLARP */
 -      p += put_u32(p, CISCO_SLARP_REPLY);
 -      *(__be32 *)p = addr;    // address
 -      p += 4;
 -      *(__be32 *)p = mask;    // netmask
 -      p += 4;
 -      p += put_u16(p, 0);     // unused
 +      *(__be32 *)(p +  4) = cpu_to_be32(CISCO_SLARP_REPLY);
-       *(__be32 *)(p +  8) = cpu_to_be32(addr); // address
-       *(__be32 *)(p + 12) = cpu_to_be32(mask); // netmask
++      *(__be32 *)(p +  8) = addr; // address
++      *(__be32 *)(p + 12) = mask; // netmask
 +      *(__be16 *)(p + 16) = cpu_to_be16(0); // unused
 +      p += 18;
  
        isdn_net_write_super(lp, skb);
  }

diff --cc drivers/net/atlx/atl1.c
Simple merge

diff --cc drivers/net/bnx2.c
Simple merge

diff --cc drivers/net/cxgb3/cxgb3_main.c
Simple merge

diff --cc drivers/net/e100.c
Simple merge

diff --cc drivers/net/e1000/e1000_main.c
Simple merge

diff --cc drivers/net/e1000e/netdev.c
Simple merge

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/net/igb/igb_ethtool.c
Simple merge

diff --cc drivers/net/igb/igb_main.c
Simple merge

diff --cc drivers/net/mlx4/mlx4_en.h
Simple merge

diff --cc drivers/net/myri10ge/myri10ge.c
Simple merge

diff --cc drivers/net/niu.c
Simple merge

diff --cc drivers/net/phy/mdio_bus.c
Simple merge

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc drivers/net/qla3xxx.c
Simple merge

diff --cc drivers/net/smc911x.c
Simple merge

diff --cc drivers/net/via-velocity.c
Simple merge

diff --cc drivers/net/wireless/hostap/hostap_wlan.h
Simple merge

diff --cc drivers/net/wireless/rtl8187_dev.c
Simple merge

diff --cc fs/cifs/cifs_spnego.c
Simple merge

diff --cc fs/cifs/connect.c
index 2df8e6d0fb0803e3b3c6c50d3a0911438825e17e,c7d341714586fdfc9086c381dc310fe81a371237..204bd1354360156cb83d469127d5bb6899a13266
--- 1/fs/cifs/connect.c
--- 2/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@@ -2078,43 -2221,44 +2221,44 @@@ cifs_mount(struct super_block *sb, stru
        } else if (!rc) {
                cFYI(1, ("Existing smb sess not found"));
                pSesInfo = sesInfoAlloc();
-               if (pSesInfo == NULL)
+               if (pSesInfo == NULL) {
                        rc = -ENOMEM;
-               else {
-                       pSesInfo->server = srvTcp;
-                       sprintf(pSesInfo->serverName, "%pI4",
-                               &sin_server.sin_addr.s_addr);
-               }
+                       goto mount_fail_check;
+               }
+ 
+               /* new SMB session uses our srvTcp ref */
+               pSesInfo->server = srvTcp;
 -              sprintf(pSesInfo->serverName, "%u.%u.%u.%u",
 -                      NIPQUAD(sin_server->sin_addr.s_addr));
++              sprintf(pSesInfo->serverName, "%pI4",
++                      &sin_server->sin_addr.s_addr);
+ 
+               write_lock(&cifs_tcp_ses_lock);
+               list_add(&pSesInfo->smb_ses_list, &srvTcp->smb_ses_list);
+               write_unlock(&cifs_tcp_ses_lock);
+ 
+               /* volume_info.password freed at unmount */
+               if (volume_info.password) {
+                       pSesInfo->password = volume_info.password;
+                       /* set to NULL to prevent freeing on exit */
+                       volume_info.password = NULL;
+               }
+               if (volume_info.username)
+                       strncpy(pSesInfo->userName, volume_info.username,
+                               MAX_USERNAME_SIZE);
+               if (volume_info.domainname) {
+                       int len = strlen(volume_info.domainname);
+                       pSesInfo->domainName = kmalloc(len + 1, GFP_KERNEL);
+                       if (pSesInfo->domainName)
+                               strcpy(pSesInfo->domainName,
+                                       volume_info.domainname);
+               }
+               pSesInfo->linux_uid = volume_info.linux_uid;
+               pSesInfo->overrideSecFlg = volume_info.secFlg;
+               down(&pSesInfo->sesSem);
  
-               if (!rc) {
-                       /* volume_info.password freed at unmount */
-                       if (volume_info.password) {
-                               pSesInfo->password = volume_info.password;
-                               /* set to NULL to prevent freeing on exit */
-                               volume_info.password = NULL;
-                       }
-                       if (volume_info.username)
-                               strncpy(pSesInfo->userName,
-                                       volume_info.username,
-                                       MAX_USERNAME_SIZE);
-                       if (volume_info.domainname) {
-                               int len = strlen(volume_info.domainname);
-                               pSesInfo->domainName =
-                                       kmalloc(len + 1, GFP_KERNEL);
-                               if (pSesInfo->domainName)
-                                       strcpy(pSesInfo->domainName,
-                                               volume_info.domainname);
-                       }
-                       pSesInfo->linux_uid = volume_info.linux_uid;
-                       pSesInfo->overrideSecFlg = volume_info.secFlg;
-                       down(&pSesInfo->sesSem);
-                       /* BB FIXME need to pass vol->secFlgs BB */
-                       rc = cifs_setup_session(xid, pSesInfo,
-                                               cifs_sb->local_nls);
-                       up(&pSesInfo->sesSem);
-                       if (!rc)
-                               atomic_inc(&srvTcp->socketUseCount);
-               }
+               /* BB FIXME need to pass vol->secFlgs BB */
+               rc = cifs_setup_session(xid, pSesInfo,
+                                       cifs_sb->local_nls);
+               up(&pSesInfo->sesSem);
        }
  
        /* search for existing tcon to this server share */

diff --cc include/linux/kernel.h
Simple merge

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

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/ip_input.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/phonet/af_phonet.c
Simple merge