1 files changed, 9 insertions, 8 deletions

diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 963da86d4ecf..ec233b64f853 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -1246,11 +1246,12 @@ static int dn_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 
         case TIOCINQ:
                 lock_sock(sk);
-                if ((skb = skb_peek(&scp->other_receive_queue)) != NULL) {
+                skb = skb_peek(&scp->other_receive_queue);
+                if (skb) {
                         amount = skb->len;
                 } else {
-                        struct sk_buff *skb = sk->sk_receive_queue.next;
-                        for(;;) {
+                        skb = sk->sk_receive_queue.next;
+                        for (;;) {
                                 if (skb ==
                                     (struct sk_buff *)&sk->sk_receive_queue)
                                         break;
@@ -1579,16 +1580,16 @@ static int __dn_getsockopt(struct socket *sock, int level,int optname, char __us
                 default:
 #ifdef CONFIG_NETFILTER
                 {
-                        int val, len;
+                        int ret, len;
 
                         if(get_user(len, optlen))
                                 return -EFAULT;
 
-                        val = nf_getsockopt(sk, PF_DECnet, optname,
+                        ret = nf_getsockopt(sk, PF_DECnet, optname,
                                                         optval, &len);
-                        if (val >= 0)
-                                val = put_user(len, optlen);
-                        return val;
+                        if (ret >= 0)
+                                ret = put_user(len, optlen);
+                        return ret;
                 }
 #endif
                 case DSO_STREAM: