72 files changed, 504 insertions, 316 deletions

diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c
index 0262210cad38..ef5356cd280a 100644
--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -161,8 +161,6 @@ static int hash_recvmsg(struct kiocb *unused, struct socket *sock,
         else if (len < ds)
                 msg->msg_flags |= MSG_TRUNC;
 
-        msg->msg_namelen = 0;
-
         lock_sock(sk);
         if (ctx->more) {
                 ctx->more = 0;
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index a1c4f0a55583..6a6dfc062d2a 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -432,7 +432,6 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
         long copied = 0;
 
         lock_sock(sk);
-        msg->msg_namelen = 0;
         for (iov = msg->msg_iov, iovlen = msg->msg_iovlen; iovlen > 0;
              iovlen--, iov++) {
                 unsigned long seglen = iov->iov_len;
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index e47dcb9d1e91..5cefb479c707 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -117,7 +117,6 @@ mISDN_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
 {
         struct sk_buff          *skb;
         struct sock             *sk = sock->sk;
-        struct sockaddr_mISDN   *maddr;
 
         int             copied, err;
 
@@ -135,9 +134,9 @@ mISDN_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
         if (!skb)
                 return err;
 
-        if (msg->msg_namelen >= sizeof(struct sockaddr_mISDN)) {
-                msg->msg_namelen = sizeof(struct sockaddr_mISDN);
-                maddr = (struct sockaddr_mISDN *)msg->msg_name;
+        if (msg->msg_name) {
+                struct sockaddr_mISDN *maddr = msg->msg_name;
+
                 maddr->family = AF_ISDN;
                 maddr->dev = _pms(sk)->dev->id;
                 if ((sk->sk_protocol == ISDN_P_LAPD_TE) ||
@@ -150,11 +149,7 @@ mISDN_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
                         maddr->sapi = _pms(sk)->ch.addr & 0xFF;
                         maddr->tei =  (_pms(sk)->ch.addr >> 8) & 0xFF;
                 }
-        } else {
-                if (msg->msg_namelen)
-                        printk(KERN_WARNING "%s: too small namelen %d\n",
-                               __func__, msg->msg_namelen);
-                msg->msg_namelen = 0;
+                msg->msg_namelen = sizeof(*maddr);
         }
 
         copied = skb->len + MISDN_HEADER_LEN;
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 74630e94fa3b..d6447b3f7409 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -697,7 +697,7 @@ static int genphy_config_advert(struct phy_device *phydev)
  *   to the values in phydev. Assumes that the values are valid.
  *   Please see phy_sanitize_settings().
  */
-static int genphy_setup_forced(struct phy_device *phydev)
+int genphy_setup_forced(struct phy_device *phydev)
 {
         int err;
         int ctl = 0;
@@ -716,7 +716,7 @@ static int genphy_setup_forced(struct phy_device *phydev)
 
         return err;
 }