From 6de46607bcff19a6e6fa5714eb05e90a65d600ab Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Tue, 7 Aug 2012 18:05:04 +0300 Subject: [PATCH] --- yaml --- r: 328183 b: refs/heads/master c: 09d5d4aa647367eeb42352a2bc9d438b9c703670 h: refs/heads/master i: 328181: 2c4fadc10be892e1acb5affc448efac6dcec871d 328179: 833d5fd8b3771ec1cd76424c6cc0ac0cc0c2c0fc 328175: 83bdc6b55eb45fbde9224f09de73cd89580d7b41 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/af_bluetooth.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 90ac1f697156..a69ff04661ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6dd548b9a3c7b3fcdd2fd97880abf7597e8334b +refs/heads/master: 09d5d4aa647367eeb42352a2bc9d438b9c703670 diff --git a/trunk/net/bluetooth/af_bluetooth.c b/trunk/net/bluetooth/af_bluetooth.c index 58f9762b339a..1b88fe41f4b1 100644 --- a/trunk/net/bluetooth/af_bluetooth.c +++ b/trunk/net/bluetooth/af_bluetooth.c @@ -567,8 +567,6 @@ static void bt_seq_stop(struct seq_file *seq, void *v) static int bt_seq_show(struct seq_file *seq, void *v) { - struct sock *sk; - struct bt_sock *bt; struct bt_seq_state *s = seq->private; struct bt_sock_list *l = s->l; bdaddr_t src_baswapped, dst_baswapped; @@ -583,8 +581,8 @@ static int bt_seq_show(struct seq_file *seq, void *v) seq_putc(seq, '\n'); } else { - sk = sk_entry(v); - bt = bt_sk(sk); + struct sock *sk = sk_entry(v); + struct bt_sock *bt = bt_sk(sk); baswap(&src_baswapped, &bt->src); baswap(&dst_baswapped, &bt->dst);