diff --git a/[refs] b/[refs]
index 57ad6ffb210c..e6bf6c173e9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec809bd817dfa1905283468e4c813684ed4efe78
+refs/heads/master: 3b1a914595f3f9beb9e38ff3ddc7bdafa092ba22
diff --git a/trunk/net/atm/pppoatm.c b/trunk/net/atm/pppoatm.c
index 226dca989448..f27a07a3c546 100644
--- a/trunk/net/atm/pppoatm.c
+++ b/trunk/net/atm/pppoatm.c
@@ -406,6 +406,8 @@ static int pppoatm_ioctl(struct socket *sock, unsigned int cmd,
 			return -ENOIOCTLCMD;
 		if (!capable(CAP_NET_ADMIN))
 			return -EPERM;
+		if (sock->state != SS_CONNECTED)
+			return -EINVAL;
 		return pppoatm_assign_vcc(atmvcc, argp);
 		}
 	case PPPIOCGCHAN: