X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=blobdiff_plain;f=net%2Fx25%2Faf_x25.c;h=2351aceb296d378fc32a94a8e6c3c2d0fb7d76e2;hp=2f235a6cb3b18f81bc7b1d285305421119986227;hb=0670b8ae66daf1d326c7bd10e73daff5f18fcf92;hpb=54aafbd4989a684ca876e49bf3e6eb931654dc02

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 2f235a6cb3b..2351aceb296 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1412,9 +1412,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 			rc = -EPERM;
 			if (!capable(CAP_NET_ADMIN))
 				break;
-			lock_kernel();
 			rc = x25_route_ioctl(cmd, argp);
-			unlock_kernel();
 			break;
 		case SIOCX25GSUBSCRIP:
 			lock_kernel();
@@ -1710,9 +1708,7 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd,
 		rc = -EPERM;
 		if (!capable(CAP_NET_ADMIN))
 			break;
-		lock_kernel();
 		rc = x25_route_ioctl(cmd, argp);
-		unlock_kernel();
 		break;
 	case SIOCX25GSUBSCRIP:
 		lock_kernel();