patch-2.4.21 linux-2.4.21/net/bluetooth/bnep/sock.c
Next file: linux-2.4.21/net/bluetooth/hci_conn.c
Previous file: linux-2.4.21/net/bluetooth/bnep/netdev.c
Back to the patch index
Back to the overall index
- Lines: 70
- Date:
2003-06-13 07:51:39.000000000 -0700
- Orig file:
linux-2.4.20/net/bluetooth/bnep/sock.c
- Orig date:
2002-11-28 15:53:15.000000000 -0800
diff -urN linux-2.4.20/net/bluetooth/bnep/sock.c linux-2.4.21/net/bluetooth/bnep/sock.c
@@ -50,7 +50,7 @@
#include "bnep.h"
-#ifndef CONFIG_BNEP_DEBUG
+#ifndef CONFIG_BLUEZ_BNEP_DEBUG
#undef BT_DBG
#define BT_DBG( A... )
#endif
@@ -103,17 +103,17 @@
static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
{
- struct bnep_conlist_req cl;
- struct bnep_conadd_req ca;
- struct bnep_condel_req cd;
- struct bnep_coninfo ci;
+ struct bnep_connlist_req cl;
+ struct bnep_connadd_req ca;
+ struct bnep_conndel_req cd;
+ struct bnep_conninfo ci;
struct socket *nsock;
int err;
BT_DBG("cmd %x arg %lx", cmd, arg);
switch (cmd) {
- case BNEPCONADD:
+ case BNEPCONNADD:
if (!capable(CAP_NET_ADMIN))
return -EACCES;
@@ -136,7 +136,7 @@
return err;
- case BNEPCONDEL:
+ case BNEPCONNDEL:
if (!capable(CAP_NET_ADMIN))
return -EACCES;
@@ -145,24 +145,24 @@
return bnep_del_connection(&cd);
- case BNEPGETCONLIST:
+ case BNEPGETCONNLIST:
if (copy_from_user(&cl, (void *) arg, sizeof(cl)))
return -EFAULT;
if (cl.cnum <= 0)
return -EINVAL;
- err = bnep_get_conlist(&cl);
+ err = bnep_get_connlist(&cl);
if (!err && copy_to_user((void *) arg, &cl, sizeof(cl)))
return -EFAULT;
return err;
- case BNEPGETCONINFO:
+ case BNEPGETCONNINFO:
if (copy_from_user(&ci, (void *) arg, sizeof(ci)))
return -EFAULT;
- err = bnep_get_coninfo(&ci);
+ err = bnep_get_conninfo(&ci);
if (!err && copy_to_user((void *) arg, &ci, sizeof(ci)))
return -EFAULT;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)