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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26: (1090 commits)
  [NET]: Fix and allocate less memory for ->priv'less netdevices
  [IPV6]: Fix dangling references on error in fib6_add().
  [NETLABEL]: Fix NULL deref in netlbl_unlabel_staticlist_gen() if ifindex not found
  [PKT_SCHED]: Fix datalen check in tcf_simp_init().
  [INET]: Uninline the __inet_inherit_port call.
  [INET]: Drop the inet_inherit_port() call.
  SCTP: Initialize partial_bytes_acked to 0, when all of the data is acked.
  [netdrvr] forcedeth: internal simplifications; changelog removal
  phylib: factor out get_phy_id from within get_phy_device
  PHY: add BCM5464 support to broadcom PHY driver
  cxgb3: Fix __must_check warning with dev_dbg.
  tc35815: Statistics cleanup
  natsemi: fix MMIO for PPC 44x platforms
  [TIPC]: Cleanup of TIPC reference table code
  [TIPC]: Optimized initialization of TIPC reference table
  [TIPC]: Remove inlining of reference table locking routines
  e1000: convert uint16_t style integers to u16
  ixgb: convert uint16_t style integers to u16
  sb1000.c: make const arrays static
  sb1000.c: stop inlining largish static functions
  ...

5 files changed, 40 insertions, 40 deletions

diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index 6dac38792288..5828e5c060ca 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -625,7 +625,7 @@ gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
         gss_auth->mech = gss_mech_get_by_pseudoflavor(flavor);
         if (!gss_auth->mech) {
                 printk(KERN_WARNING "%s: Pseudoflavor %d not found!\n",
-                                __FUNCTION__, flavor);
+                                __func__, flavor);
                 goto err_free;
         }
         gss_auth->service = gss_pseudoflavor_to_service(gss_auth->mech, flavor);
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 8834d68972cb..7b96ff38002f 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -43,7 +43,7 @@
 
 #define dprint_status(t)                                        \
         dprintk("RPC: %5u %s (status %d)\n", t->tk_pid,         \
-                        __FUNCTION__, t->tk_status)
+                        __func__, t->tk_status)
 
 /*
  * All RPC clients are linked into this list
@@ -368,7 +368,7 @@ out_no_path:
 out_no_stats:
         kfree(new);
 out_no_clnt:
-        dprintk("RPC:       %s: returned error %d\n", __FUNCTION__, err);
+        dprintk("RPC:       %s: returned error %d\n", __func__, err);
         return ERR_PTR(err);
 }
 EXPORT_SYMBOL_GPL(rpc_clone_client);
@@ -752,7 +752,7 @@ call_reserveresult(struct rpc_task *task)
                 }
 
                 printk(KERN_ERR "%s: status=%d, but no request slot, exiting\n",
-                                __FUNCTION__, status);
+                                __func__, status);
                 rpc_exit(task, -EIO);
                 return;
         }
@@ -763,7 +763,7 @@ call_reserveresult(struct rpc_task *task)
          */
         if (task->tk_rqstp) {
                 printk(KERN_ERR "%s: status=%d, request allocated anyway\n",
-                                __FUNCTION__, status);
+                                __func__, status);
                 xprt_release(task);
         }
 
@@ -775,7 +775,7 @@ call_reserveresult(struct rpc_task *task)
                 break;
         default:
                 printk(KERN_ERR "%s: unrecognized error %d, exiting\n",
-                                __FUNCTION__, status);
+                                __func__, status);
                 break;
         }
         rpc_exit(task, status);
@@ -1323,7 +1323,7 @@ call_verify(struct rpc_task *task)
                  *   undefined results
                  */
                 dprintk("RPC: %5u %s: XDR representation not a multiple of"
-                       " 4 bytes: 0x%x\n", task->tk_pid, __FUNCTION__,
+                       " 4 bytes: 0x%x\n", task->tk_pid, __func__,
                        task->tk_rqstp->rq_rcv_buf.len);
                 goto out_eio;
         }
@@ -1333,7 +1333,7 @@ call_verify(struct rpc_task *task)
 
         if ((n = ntohl(*p++)) != RPC_REPLY) {
                 dprintk("RPC: %5u %s: not an RPC reply: %x\n",
-                                task->tk_pid, __FUNCTION__, n);
+                                task->tk_pid, __func__, n);
                 goto out_garbage;
         }
         if ((n = ntohl(*p++)) != RPC_MSG_ACCEPTED) {
@@ -1345,13 +1345,13 @@ call_verify(struct rpc_task *task)
                         case RPC_MISMATCH:
                                 dprintk("RPC: %5u %s: RPC call version "
                                                 "mismatch!\n",
-                                                task->tk_pid, __FUNCTION__);
+                                                task->tk_pid, __func__);
                                 error = -EPROTONOSUPPORT;
                                 goto out_err;
                         default:
                                 dprintk("RPC: %5u %s: RPC call rejected, "
                                                 "unknown error: %x\n",
-                                                task->tk_pid, __FUNCTION__, n);
+                                                task->tk_pid, __func__, n);
                                 goto out_eio;
                 }
                 if (--len < 0)
@@ -1365,7 +1365,7 @@ call_verify(struct rpc_task *task)
                                 break;
                         task->tk_cred_retry--;
                         dprintk("RPC: %5u %s: retry stale creds\n",
-                                        task->tk_pid, __FUNCTION__);
+                                        task->tk_pid, __func__);
                         rpcauth_invalcred(task);
                         /* Ensure we obtain a new XID! */
                         xprt_release(task);
@@ -1378,7 +1378,7 @@ call_verify(struct rpc_task *task)
                                 break;
                         task->tk_garb_retry--;
                         dprintk("RPC: %5u %s: retry garbled creds\n",
-                                        task->tk_pid, __FUNCTION__);
+                                        task->tk_pid, __func__);
                         task->tk_action = call_bind;
                         goto out_retry;
                 case RPC_AUTH_TOOWEAK:
@@ -1387,16 +1387,16 @@ call_verify(struct rpc_task *task)
                         break;
                 default:
                         dprintk("RPC: %5u %s: unknown auth error: %x\n",
-                                        task->tk_pid, __FUNCTION__, n);
+                                        task->tk_pid, __func__, n);
                         error = -EIO;
                 }
                 dprintk("RPC: %5u %s: call rejected %d\n",
-                                task->tk_pid, __FUNCTION__, n);
+                                task->tk_pid, __func__, n);
                 goto out_err;
         }
         if (!(p = rpcauth_checkverf(task, p))) {
                 dprintk("RPC: %5u %s: auth check failed\n",
-                                task->tk_pid, __FUNCTION__);
+                                task->tk_pid, __func__);
                 goto out_garbage;               /* bad verifier, retry */
         }
         len = p - (__be32 *)iov->iov_base - 1;
@@ -1407,14 +1407,14 @@ call_verify(struct rpc_task *task)
                 return p;
         case RPC_PROG_UNAVAIL:
                 dprintk("RPC: %5u %s: program %u is unsupported by server %s\n",
-                                task->tk_pid, __FUNCTION__,
+                                task->tk_pid, __func__,
                                 (unsigned int)task->tk_client->cl_prog,
                                 task->tk_client->cl_server);
                 error = -EPFNOSUPPORT;
                 goto out_err;
         case RPC_PROG_MISMATCH:
                 dprintk("RPC: %5u %s: program %u, version %u unsupported by "
-                                "server %s\n", task->tk_pid, __FUNCTION__,
+                                "server %s\n", task->tk_pid, __func__,
                                 (unsigned int)task->tk_client->cl_prog,
                                 (unsigned int)task->tk_client->cl_vers,
                                 task->tk_client->cl_server);
@@ -1423,7 +1423,7 @@ call_verify(struct rpc_task *task)
         case RPC_PROC_UNAVAIL:
                 dprintk("RPC: %5u %s: proc %p unsupported by program %u, "
                                 "version %u on server %s\n",
-                                task->tk_pid, __FUNCTION__,
+                                task->tk_pid, __func__,
                                 task->tk_msg.rpc_proc,
                                 task->tk_client->cl_prog,
                                 task->tk_client->cl_vers,
@@ -1432,11 +1432,11 @@ call_verify(struct rpc_task *task)
                 goto out_err;
         case RPC_GARBAGE_ARGS:
                 dprintk("RPC: %5u %s: server saw garbage\n",
-                                task->tk_pid, __FUNCTION__);
+                                task->tk_pid, __func__);
                 break;                  /* retry */
         default:
                 dprintk("RPC: %5u %s: server accept status: %x\n",
-                                task->tk_pid, __FUNCTION__, n);
+                                task->tk_pid, __func__, n);
                 /* Also retry */
         }
 
@@ -1445,7 +1445,7 @@ out_garbage:
         if (task->tk_garb_retry) {
                 task->tk_garb_retry--;
                 dprintk("RPC: %5u %s: retrying\n",
-                                task->tk_pid, __FUNCTION__);
+                                task->tk_pid, __func__);
                 task->tk_action = call_bind;
 out_retry:
                 return ERR_PTR(-EAGAIN);
@@ -1455,11 +1455,11 @@ out_eio:
 out_err:
         rpc_exit(task, error);
         dprintk("RPC: %5u %s: call failed with error %d\n", task->tk_pid,
-                        __FUNCTION__, error);
+                        __func__, error);
         return ERR_PTR(error);
 out_overflow:
         dprintk("RPC: %5u %s: server reply was truncated.\n", task->tk_pid,
-                        __FUNCTION__);
+                        __func__);
         goto out_garbage;
 }
 
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 1b395a41a8b2..5a9b0e7828cd 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -479,13 +479,13 @@ rpc_lookup_parent(char *path, struct nameidata *nd)
         mnt = rpc_get_mount();
         if (IS_ERR(mnt)) {
                 printk(KERN_WARNING "%s: %s failed to mount "
-                               "pseudofilesystem \n", __FILE__, __FUNCTION__);
+                               "pseudofilesystem \n", __FILE__, __func__);
                 return PTR_ERR(mnt);
         }
 
         if (vfs_path_lookup(mnt->mnt_root, mnt, path, LOOKUP_PARENT, nd)) {
                 printk(KERN_WARNING "%s: %s failed to find path %s\n",
-                                __FILE__, __FUNCTION__, path);
+                                __FILE__, __func__, path);
                 rpc_put_mount();
                 return -ENOENT;
         }
@@ -604,7 +604,7 @@ rpc_populate(struct dentry *parent,
 out_bad:
         mutex_unlock(&dir->i_mutex);
         printk(KERN_WARNING "%s: %s failed to populate directory %s\n",
-                        __FILE__, __FUNCTION__, parent->d_name.name);
+                        __FILE__, __func__, parent->d_name.name);
         return -ENOMEM;
 }
 
@@ -623,7 +623,7 @@ __rpc_mkdir(struct inode *dir, struct dentry *dentry)
         return 0;
 out_err:
         printk(KERN_WARNING "%s: %s failed to allocate inode for dentry %s\n",
-                        __FILE__, __FUNCTION__, dentry->d_name.name);
+                        __FILE__, __func__, dentry->d_name.name);
         return -ENOMEM;
 }
 
@@ -715,7 +715,7 @@ err_depopulate:
 err_dput:
         dput(dentry);
         printk(KERN_WARNING "%s: %s() failed to create directory %s (errno = %d)\n",
-                        __FILE__, __FUNCTION__, path, error);
+                        __FILE__, __func__, path, error);
         dentry = ERR_PTR(error);
         goto out;
 }
@@ -804,7 +804,7 @@ err_dput:
         dput(dentry);
         dentry = ERR_PTR(-ENOMEM);
         printk(KERN_WARNING "%s: %s() failed to create pipe %s/%s (errno = %d)\n",
-                        __FILE__, __FUNCTION__, parent->d_name.name, name,
+                        __FILE__, __func__, parent->d_name.name, name,
                         -ENOMEM);
         goto out;
 }
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index 3164a0871cf0..56aa018dce3a 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -224,7 +224,7 @@ int rpcb_getport_sync(struct sockaddr_in *sin, u32 prog, u32 vers, int prot)
         int status;
 
         dprintk("RPC:       %s(" NIPQUAD_FMT ", %u, %u, %d)\n",
-                __FUNCTION__, NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot);
+                __func__, NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot);
 
         rpcb_clnt = rpcb_create(NULL, (struct sockaddr *)sin,
                                 sizeof(*sin), prot, 2, 0);
@@ -283,7 +283,7 @@ void rpcb_getport_async(struct rpc_task *task)
         struct rpcb_info *info;
 
         dprintk("RPC: %5u %s(%s, %u, %u, %d)\n",
-                task->tk_pid, __FUNCTION__,
+                task->tk_pid, __func__,
                 clnt->cl_server, clnt->cl_prog, clnt->cl_vers, xprt->prot);
 
         /* Autobind on cloned rpc clients is discouraged */
@@ -292,7 +292,7 @@ void rpcb_getport_async(struct rpc_task *task)
         if (xprt_test_and_set_binding(xprt)) {
                 status = -EAGAIN;       /* tell caller to check again */
                 dprintk("RPC: %5u %s: waiting for another binder\n",
-                        task->tk_pid, __FUNCTION__);
+                        task->tk_pid, __func__);
                 goto bailout_nowake;
         }
 
@@ -304,7 +304,7 @@ void rpcb_getport_async(struct rpc_task *task)
         if (xprt_bound(xprt)) {
                 status = 0;
                 dprintk("RPC: %5u %s: already bound\n",
-                        task->tk_pid, __FUNCTION__);
+                        task->tk_pid, __func__);
                 goto bailout_nofree;
         }
 
@@ -321,27 +321,27 @@ void rpcb_getport_async(struct rpc_task *task)
         default:
                 status = -EAFNOSUPPORT;
                 dprintk("RPC: %5u %s: bad address family\n",
-                                task->tk_pid, __FUNCTION__);
+                                task->tk_pid, __func__);
                 goto bailout_nofree;
         }
         if (info[xprt->bind_index].rpc_proc == NULL) {
                 xprt->bind_index = 0;
                 status = -EPFNOSUPPORT;
                 dprintk("RPC: %5u %s: no more getport versions available\n",
-                        task->tk_pid, __FUNCTION__);
+                        task->tk_pid, __func__);
                 goto bailout_nofree;
         }
         bind_version = info[xprt->bind_index].rpc_vers;
 
         dprintk("RPC: %5u %s: trying rpcbind version %u\n",
-                task->tk_pid, __FUNCTION__, bind_version);
+                task->tk_pid, __func__, bind_version);
 
         rpcb_clnt = rpcb_create(clnt->cl_server, sap, salen, xprt->prot,
                                 bind_version, 0);
         if (IS_ERR(rpcb_clnt)) {
                 status = PTR_ERR(rpcb_clnt);
                 dprintk("RPC: %5u %s: rpcb_create failed, error %ld\n",
-                        task->tk_pid, __FUNCTION__, PTR_ERR(rpcb_clnt));
+                        task->tk_pid, __func__, PTR_ERR(rpcb_clnt));
                 goto bailout_nofree;
         }
 
@@ -349,7 +349,7 @@ void rpcb_getport_async(struct rpc_task *task)
         if (!map) {
                 status = -ENOMEM;
                 dprintk("RPC: %5u %s: no memory available\n",
-                        task->tk_pid, __FUNCTION__);
+                        task->tk_pid, __func__);
                 goto bailout_nofree;
         }
         map->r_prog = clnt->cl_prog;
@@ -366,7 +366,7 @@ void rpcb_getport_async(struct rpc_task *task)
         if (IS_ERR(child)) {
                 status = -EIO;
                 dprintk("RPC: %5u %s: rpc_run_task failed\n",
-                        task->tk_pid, __FUNCTION__);
+                        task->tk_pid, __func__);
                 goto bailout;
         }
         rpc_put_task(child);
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 30e7ac243a90..613daf8c1ff7 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1359,7 +1359,7 @@ static int xs_bind4(struct sock_xprt *transport, struct socket *sock)
                         nloop++;
         } while (err == -EADDRINUSE && nloop != 2);
         dprintk("RPC:       %s "NIPQUAD_FMT":%u: %s (%d)\n",
-                        __FUNCTION__, NIPQUAD(myaddr.sin_addr),
+                        __func__, NIPQUAD(myaddr.sin_addr),
                         port, err ? "failed" : "ok", err);
         return err;
 }