Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c03824a authored by Matt Wagantall's avatar Matt Wagantall
Browse files

Merge tag 'v3.18.8' into msm-3.18



This is the 3.18.8 stable release

Change-Id: I98ec48068986c859dd93185dfdb95a91818594ea
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parents daf8f716 e5c9f0bb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
VERSION = 3
PATCHLEVEL = 18
SUBLEVEL = 7
SUBLEVEL = 8
EXTRAVERSION =
NAME = Shuffling Zombie Juror

+9 −3
Original line number Diff line number Diff line
@@ -42,11 +42,17 @@ static int ir_lirc_decode(struct rc_dev *dev, struct ir_raw_event ev)
		return -EINVAL;

	/* Packet start */
	if (ev.reset)
		return 0;
	if (ev.reset) {
		/* Userspace expects a long space event before the start of
		 * the signal to use as a sync.  This may be done with repeat
		 * packets and normal samples.  But if a reset has been sent
		 * then we assume that a long time has passed, so we send a
		 * space with the maximum time value. */
		sample = LIRC_SPACE(LIRC_VALUE_MASK);
		IR_dprintk(2, "delivering reset sync space to lirc_dev\n");

	/* Carrier reports */
	if (ev.carrier_report) {
	} else if (ev.carrier_report) {
		sample = LIRC_FREQUENCY(ev.carrier);
		IR_dprintk(2, "carrier report (freq: %d)\n", sample);

+1 −1
Original line number Diff line number Diff line
@@ -3175,7 +3175,7 @@ static int bnx2x_poll(struct napi_struct *napi, int budget)
		}
#endif
		if (!bnx2x_fp_lock_napi(fp))
			return work_done;
			return budget;

		for_each_cos_in_tx_queue(fp, cos)
			if (bnx2x_tx_queue_has_work(fp->txdata_ptr[cos]))
+4 −1
Original line number Diff line number Diff line
@@ -2388,7 +2388,10 @@ static int netxen_nic_poll(struct napi_struct *napi, int budget)

	work_done = netxen_process_rcv_ring(sds_ring, budget);

	if ((work_done < budget) && tx_complete) {
	if (!tx_complete)
		work_done = budget;

	if (work_done < budget) {
		napi_complete(&sds_ring->napi);
		if (test_bit(__NX_DEV_UP, &adapter->state))
			netxen_nic_enable_int(sds_ring);
+8 −3
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ int netvsc_send(struct hv_device *device,
	u64 req_id;
	unsigned int section_index = NETVSC_INVALID_INDEX;
	u32 msg_size = 0;
	struct sk_buff *skb;
	struct sk_buff *skb = NULL;
	u16 q_idx = packet->q_idx;


@@ -743,8 +743,6 @@ int netvsc_send(struct hv_device *device,
							   packet);
			skb = (struct sk_buff *)
			      (unsigned long)packet->send_completion_tid;
			if (skb)
				dev_kfree_skb_any(skb);
			packet->page_buf_cnt = 0;
		}
	}
@@ -807,6 +805,13 @@ int netvsc_send(struct hv_device *device,
			   packet, ret);
	}

	if (ret != 0) {
		if (section_index != NETVSC_INVALID_INDEX)
			netvsc_free_send_slot(net_device, section_index);
	} else if (skb) {
		dev_kfree_skb_any(skb);
	}

	return ret;
}

Loading