summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg2012-02-16 23:34:40 +0100
committerJohan Hedberg2012-02-17 10:27:11 +0100
commit76a7f3a40c2bfbdb5f2b23ac780fa4e4f22e8659 (patch)
treeeba2d9b800e7681a7841bb34408ae514fb644803 /net
parentBluetooth: Do not dereference zero sk (diff)
downloadkernel-qcow2-linux-76a7f3a40c2bfbdb5f2b23ac780fa4e4f22e8659.tar.gz
kernel-qcow2-linux-76a7f3a40c2bfbdb5f2b23ac780fa4e4f22e8659.tar.xz
kernel-qcow2-linux-76a7f3a40c2bfbdb5f2b23ac780fa4e4f22e8659.zip
Bluetooth: Remove unused member from cmd_lookup struct
The val member of cmd_lookup isn't used anywhere so it can be removed. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/mgmt.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 066d338be1ce..5520858553cc 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2561,7 +2561,6 @@ int mgmt_index_removed(struct hci_dev *hdev)
}
struct cmd_lookup {
- u8 val;
struct sock *sk;
struct hci_dev *hdev;
};
@@ -2584,7 +2583,7 @@ static void settings_rsp(struct pending_cmd *cmd, void *data)
int mgmt_powered(struct hci_dev *hdev, u8 powered)
{
- struct cmd_lookup match = { powered, NULL, hdev };
+ struct cmd_lookup match = { NULL, hdev };
__le32 ev;
int ret;
@@ -2608,7 +2607,7 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)
int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable)
{
- struct cmd_lookup match = { discoverable, NULL, hdev };
+ struct cmd_lookup match = { NULL, hdev };
__le32 ev;
int ret;
@@ -2627,7 +2626,7 @@ int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable)
int mgmt_connectable(struct hci_dev *hdev, u8 connectable)
{
__le32 ev;
- struct cmd_lookup match = { connectable, NULL, hdev };
+ struct cmd_lookup match = { NULL, hdev };
int ret;
mgmt_pending_foreach(MGMT_OP_SET_CONNECTABLE, hdev, settings_rsp,