diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:21:39 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:21:39 -0700 |
commit | f249a14dd1b6b341e7b5e29b64c0edae6e13b7f5 (patch) | |
tree | e5b53c75e42b5ac0d9b8feac65ce4b7a1b2a17bd /net | |
parent | 48cf795880b441a6c59cd840d0475fac7fdffd87 (diff) | |
parent | 0c5c1f1a4f991ee015da85cce6d2d9f9c9380b4f (diff) |
Merge tag 'v4.1.7' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v4.1lsk-v4.1-15.09
This is the 4.1.7 stable release
* tag 'v4.1.7' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (165 commits)
Linux 4.1.7
ARM: 8405/1: VDSO: fix regression with toolchains lacking ld.bfd executable
x86/idle: Restore trace_cpu_idle to mwait_idle() calls
x86/apic: Fix fallout from x2apic cleanup
x86/xen: make CONFIG_XEN depend on CONFIG_X86_LOCAL_APIC
arm64: perf: fix unassigned cpu_pmu->plat_device when probing PMU PPIs
arm64: KVM: Fix host crash when injecting a fault into a 32bit guest
fnic: Use the local variable instead of I/O flag to acquire io_req_lock in fnic_queuecommand() to avoid deadloack
Add factory recertified Crucial M500s to blacklist
can: pcan_usb: don't provide CAN FD bittimings by non-FD adapters
SCSI: Fix NULL pointer dereference in runtime PM
genirq: Introduce irq_chip_set_type_parent() helper
genirq: Don't return ENOSYS in irq_chip_retrigger_hierarchy
ARM: OMAP: wakeupgen: Restore the irq_set_type() mechanism
irqchip/crossbar: Restore set_wake functionality
irqchip/crossbar: Restore the mask on suspend behaviour
irqchip/crossbar: Restore the irq_set_type() mechanism
9p: ensure err is initialized to 0 in p9_client_read/write
drm/i915: Avoid TP3 on CHV
drm/i915: remove HBR2 from chv supported list
...
Diffstat (limited to 'net')
-rw-r--r-- | net/9p/client.c | 2 | ||||
-rw-r--r-- | net/bluetooth/smp.c | 4 | ||||
-rw-r--r-- | net/mac80211/rc80211_minstrel.c | 11 |
3 files changed, 12 insertions, 5 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index 81925b923318..fcf6fe063d82 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -1541,6 +1541,7 @@ p9_client_read(struct p9_fid *fid, u64 offset, struct iov_iter *to, int *err) struct p9_client *clnt = fid->clnt; struct p9_req_t *req; int total = 0; + *err = 0; p9_debug(P9_DEBUG_9P, ">>> TREAD fid %d offset %llu %d\n", fid->fid, (unsigned long long) offset, (int)iov_iter_count(to)); @@ -1616,6 +1617,7 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err) struct p9_client *clnt = fid->clnt; struct p9_req_t *req; int total = 0; + *err = 0; p9_debug(P9_DEBUG_9P, ">>> TWRITE fid %d offset %llu count %zd\n", fid->fid, (unsigned long long) offset, diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 1ab3dc9c8f99..7b815bcc8c9b 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -2295,6 +2295,10 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level) return 1; chan = conn->smp; + if (!chan) { + BT_ERR("SMP security requested but not available"); + return 1; + } if (!hci_dev_test_flag(hcon->hdev, HCI_LE_ENABLED)) return 1; diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c index 247552a7f6c2..3ece7d1034c8 100644 --- a/net/mac80211/rc80211_minstrel.c +++ b/net/mac80211/rc80211_minstrel.c @@ -92,14 +92,15 @@ int minstrel_get_tp_avg(struct minstrel_rate *mr, int prob_ewma) static inline void minstrel_sort_best_tp_rates(struct minstrel_sta_info *mi, int i, u8 *tp_list) { - int j = MAX_THR_RATES; - struct minstrel_rate_stats *tmp_mrs = &mi->r[j - 1].stats; + int j; + struct minstrel_rate_stats *tmp_mrs; struct minstrel_rate_stats *cur_mrs = &mi->r[i].stats; - while (j > 0 && (minstrel_get_tp_avg(&mi->r[i], cur_mrs->prob_ewma) > - minstrel_get_tp_avg(&mi->r[tp_list[j - 1]], tmp_mrs->prob_ewma))) { - j--; + for (j = MAX_THR_RATES; j > 0; --j) { tmp_mrs = &mi->r[tp_list[j - 1]].stats; + if (minstrel_get_tp_avg(&mi->r[i], cur_mrs->prob_ewma) <= + minstrel_get_tp_avg(&mi->r[tp_list[j - 1]], tmp_mrs->prob_ewma)) + break; } if (j < MAX_THR_RATES - 1) |