leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Rename cmd to param in pending_cmd

Browse Source 
This field holds not whole command but only command specific
parameters.

Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Szymon Janc 2011-03-22 13:12:19 +01:00 committed by Gustavo F. Padovan
parent e0e185efba
commit c68fb7ff29
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/bluetooth/mgmt.c
View File

@ -36,7 +36,7 @@ struct pending_cmd {
struct list_head list; struct list_head list;
__u16 opcode; __u16 opcode;
int index; int index;
void *cmd; void *param;
struct sock *sk; struct sock *sk;
void *user_data; void *user_data;
}; };
@ -217,7 +217,7 @@ static int read_controller_info(struct sock *sk, u16 index)
static void mgmt_pending_free(struct pending_cmd *cmd) static void mgmt_pending_free(struct pending_cmd *cmd)
{ {
sock_put(cmd->sk); sock_put(cmd->sk);
kfree(cmd->cmd); kfree(cmd->param);
kfree(cmd); kfree(cmd);
} }
@ -233,13 +233,13 @@ static struct pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode,
cmd->opcode = opcode; cmd->opcode = opcode;
cmd->index = index; cmd->index = index;
cmd->cmd = kmalloc(len, GFP_ATOMIC); cmd->param = kmalloc(len, GFP_ATOMIC);
if (!cmd->cmd) { if (!cmd->param) {
kfree(cmd); kfree(cmd);
return NULL; return NULL;
} }
memcpy(cmd->cmd, data, len); memcpy(cmd->param, data, len);
cmd->sk = sk; cmd->sk = sk;
sock_hold(sk); sock_hold(sk);
@ -1426,7 +1426,7 @@ struct cmd_lookup {
static void mode_rsp(struct pending_cmd *cmd, void *data) static void mode_rsp(struct pending_cmd *cmd, void *data)
{ {
struct mgmt_mode *cp = cmd->cmd; struct mgmt_mode *cp = cmd->param;
struct cmd_lookup *match = data; struct cmd_lookup *match = data;
if (cp->val != match->val) if (cp->val != match->val)
@ -1525,7 +1525,7 @@ int mgmt_connected(u16 index, bdaddr_t *bdaddr)
static void disconnect_rsp(struct pending_cmd *cmd, void *data) static void disconnect_rsp(struct pending_cmd *cmd, void *data)
{ {
struct mgmt_cp_disconnect *cp = cmd->cmd; struct mgmt_cp_disconnect *cp = cmd->param;
struct sock **sk = data; struct sock **sk = data;
struct mgmt_rp_disconnect rp; struct mgmt_rp_disconnect rp;