Kill old BNEP ioctls.

net/bluetooth/bnep/bnep.h

@@ -117,12 +117,6 @@ struct bnep_ext_hdr {
 #define BNEPGETCONNLIST	_IOR('B', 210, int)
 #define BNEPGETCONNINFO	_IOR('B', 211, int)
 
-// Ioctl interface
-#define BNEPCONADD      1
-#define BNEPCONDEL      2
-#define BNEPGETCONLIST  3
-#define BNEPGETCONINFO  4
-
 struct bnep_connadd_req {
 	int   sock;       // Connected socket
 	__u32 flags;

net/bluetooth/bnep/sock.c

@@ -83,7 +83,6 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
 	BT_DBG("cmd %x arg %lx", cmd, arg);
 
 	switch (cmd) {
-	case BNEPCONADD:
 	case BNEPCONNADD:
 		if (!capable(CAP_NET_ADMIN))
 			return -EACCES;
@@ -107,7 +106,6 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
 
 		return err;
 	
-	case BNEPCONDEL:
 	case BNEPCONNDEL:
 		if (!capable(CAP_NET_ADMIN))
 			return -EACCES;
@@ -117,7 +115,6 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
 	
 		return bnep_del_connection(&cd);
 
-	case BNEPGETCONLIST:
 	case BNEPGETCONNLIST:
 		if (copy_from_user(&cl, (void *) arg, sizeof(cl)))
 			return -EFAULT;
@@ -131,7 +128,6 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
 
 		return err;
 
-	case BNEPGETCONINFO:
 	case BNEPGETCONNINFO:
 		if (copy_from_user(&ci, (void *) arg, sizeof(ci)))
 			return -EFAULT;