aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/ax25/af_ax25.c6
-rw-r--r--net/netrom/af_netrom.c4
-rw-r--r--net/rose/af_rose.c4
3 files changed, 3 insertions, 11 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 17f192b77867..9c487311e0a9 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1700,11 +1700,7 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
1700 } 1700 }
1701 1701
1702 case SIOCGSTAMP: 1702 case SIOCGSTAMP:
1703 if (sk != NULL) { 1703 res = sock_get_timestamp(sk, argp);
1704 res = sock_get_timestamp(sk, argp);
1705 break;
1706 }
1707 res = -EINVAL;
1708 break; 1704 break;
1709 1705
1710 case SIOCAX25ADDUID: /* Add a uid to the uid/call map table */ 1706 case SIOCAX25ADDUID: /* Add a uid to the uid/call map table */
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index f4578c759ffc..02b1ab52dbbf 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1187,9 +1187,7 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
1187 } 1187 }
1188 1188
1189 case SIOCGSTAMP: 1189 case SIOCGSTAMP:
1190 ret = -EINVAL; 1190 ret = sock_get_timestamp(sk, argp);
1191 if (sk != NULL)
1192 ret = sock_get_timestamp(sk, argp);
1193 release_sock(sk); 1191 release_sock(sk);
1194 return ret; 1192 return ret;
1195 1193
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 3077878ed4f0..977f99a9cfc0 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1256,9 +1256,7 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
1256 } 1256 }
1257 1257
1258 case SIOCGSTAMP: 1258 case SIOCGSTAMP:
1259 if (sk != NULL) 1259 return sock_get_timestamp(sk, (struct timeval __user *)argp);
1260 return sock_get_timestamp(sk, (struct timeval __user *)argp);
1261 return -EINVAL;
1262 1260
1263 case SIOCGIFADDR: 1261 case SIOCGIFADDR:
1264 case SIOCSIFADDR: 1262 case SIOCSIFADDR: