diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-26 21:16:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-26 21:16:46 +0200 |
| commit | 2bd93d7af1581d40e3c4b25242472661cb7c637a (patch) | |
| tree | 43c638422d20857339d8d908d6b65ebb8045edc0 /net/bluetooth/hci_event.c | |
| parent | tg3: Update version to 3.118 (diff) | |
| parent | net: provide cow_metrics() methods to blackhole dst_ops (diff) | |
| download | linux-2bd93d7af1581d40e3c4b25242472661cb7c637a.tar.xz linux-2bd93d7af1581d40e3c4b25242472661cb7c637a.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index c7eb073fe633..cb25628c0583 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2419,8 +2419,6 @@ static inline void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *s if (!conn) goto unlock; - hci_conn_hold(conn); - conn->remote_cap = ev->capability; conn->remote_oob = ev->oob_data; conn->remote_auth = ev->authentication; |