From 64076d974c27c9eff9fa85d08df4c977d4588e41 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 12 Sep 2005 14:23:52 -0700
Subject: [PATCH] --- yaml --- r: 8702 b: refs/heads/master c:
 9b37ee75858ce35cf3c0e4724acaf4efabb45687 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/ax25/af_ax25.c     | 6 +-----
 trunk/net/netrom/af_netrom.c | 4 +---
 trunk/net/rose/af_rose.c     | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 9e45109c2b60..73907ef55d76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ddcf626fd0a3cbf410ceb483cb76074ed1c5873
+refs/heads/master: 9b37ee75858ce35cf3c0e4724acaf4efabb45687
diff --git a/trunk/net/ax25/af_ax25.c b/trunk/net/ax25/af_ax25.c
index 17f192b77867..9c487311e0a9 100644
--- a/trunk/net/ax25/af_ax25.c
+++ b/trunk/net/ax25/af_ax25.c
@@ -1700,11 +1700,7 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 	}
 
 	case SIOCGSTAMP:
-		if (sk != NULL) {
-			res = sock_get_timestamp(sk, argp);
-			break;
-	 	}
-		res = -EINVAL;
+		res = sock_get_timestamp(sk, argp);
 		break;
 
 	case SIOCAX25ADDUID:	/* Add a uid to the uid/call map table */
diff --git a/trunk/net/netrom/af_netrom.c b/trunk/net/netrom/af_netrom.c
index f4578c759ffc..02b1ab52dbbf 100644
--- a/trunk/net/netrom/af_netrom.c
+++ b/trunk/net/netrom/af_netrom.c
@@ -1187,9 +1187,7 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 	}
 
 	case SIOCGSTAMP:
-		ret = -EINVAL;
-		if (sk != NULL)
-			ret = sock_get_timestamp(sk, argp);
+		ret = sock_get_timestamp(sk, argp);
 		release_sock(sk);
 		return ret;
 
diff --git a/trunk/net/rose/af_rose.c b/trunk/net/rose/af_rose.c
index 3077878ed4f0..977f99a9cfc0 100644
--- a/trunk/net/rose/af_rose.c
+++ b/trunk/net/rose/af_rose.c
@@ -1256,9 +1256,7 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 	}
 
 	case SIOCGSTAMP:
-		if (sk != NULL) 
-			return sock_get_timestamp(sk, (struct timeval __user *)argp);
-		return -EINVAL;
+		return sock_get_timestamp(sk, (struct timeval __user *)argp);
 
 	case SIOCGIFADDR:
 	case SIOCSIFADDR: