diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-04 21:35:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-04 21:35:43 -0500 |
| commit | 117ff42fd43e92d24c6aa6f3e4f0f1e1edada140 (patch) | |
| tree | c08e1c0357fde481a16489b77feb8f6073faf538 /net | |
| parent | 1d5783030a14d1b6ee763f63c8136e581f48b365 (diff) | |
| parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_core.c | 2 | ||||
| -rw-r--r-- | net/sched/sch_qfq.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 6d38d80195cb..845da3ee56a0 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
| @@ -643,7 +643,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) | |||
| 643 | if (!test_bit(HCI_RAW, &hdev->flags)) { | 643 | if (!test_bit(HCI_RAW, &hdev->flags)) { |
| 644 | set_bit(HCI_INIT, &hdev->flags); | 644 | set_bit(HCI_INIT, &hdev->flags); |
| 645 | __hci_request(hdev, hci_reset_req, 0, | 645 | __hci_request(hdev, hci_reset_req, 0, |
| 646 | msecs_to_jiffies(HCI_INIT_TIMEOUT)); | 646 | msecs_to_jiffies(250)); |
| 647 | clear_bit(HCI_INIT, &hdev->flags); | 647 | clear_bit(HCI_INIT, &hdev->flags); |
| 648 | } | 648 | } |
| 649 | 649 | ||
diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c index 2c5ff6148589..e68cb440756a 100644 --- a/net/sched/sch_qfq.c +++ b/net/sched/sch_qfq.c | |||
| @@ -818,11 +818,11 @@ skip_unblock: | |||
| 818 | static void qfq_update_start(struct qfq_sched *q, struct qfq_class *cl) | 818 | static void qfq_update_start(struct qfq_sched *q, struct qfq_class *cl) |
| 819 | { | 819 | { |
| 820 | unsigned long mask; | 820 | unsigned long mask; |
| 821 | uint32_t limit, roundedF; | 821 | u64 limit, roundedF; |
| 822 | int slot_shift = cl->grp->slot_shift; | 822 | int slot_shift = cl->grp->slot_shift; |
| 823 | 823 | ||
| 824 | roundedF = qfq_round_down(cl->F, slot_shift); | 824 | roundedF = qfq_round_down(cl->F, slot_shift); |
| 825 | limit = qfq_round_down(q->V, slot_shift) + (1UL << slot_shift); | 825 | limit = qfq_round_down(q->V, slot_shift) + (1ULL << slot_shift); |
| 826 | 826 | ||
| 827 | if (!qfq_gt(cl->F, q->V) || qfq_gt(roundedF, limit)) { | 827 | if (!qfq_gt(cl->F, q->V) || qfq_gt(roundedF, limit)) { |
| 828 | /* timestamp was stale */ | 828 | /* timestamp was stale */ |