Merge "msm: ipa: fix page_recycle_cnt array size"

drivers/platform/msm/ipa/ipa_v3/ipa_dp.c

@@ -1343,7 +1343,7 @@ int ipa3_setup_sys_pipe(struct ipa_sys_connect_params *sys_in, u32 *clnt_hdl)
 	if (ipa3_assign_policy(sys_in, ep->sys)) {
 		IPAERR("failed to sys ctx for client %d\n", sys_in->client);
 		result = -ENOMEM;
-		goto fail_napi_rx;
+		goto fail_napi;
 	}
 
 	ep->valid = 1;
@@ -1553,12 +1553,11 @@ fail_page_recycle_repl:
 		ep->sys->page_recycle_repl->capacity = 0;
 		kfree(ep->sys->page_recycle_repl);
 	}
-fail_napi_rx:
+fail_napi:
 	if (sys_in->client == IPA_CLIENT_APPS_WAN_LOW_LAT_DATA_CONS) {
 		napi_disable(&ep->sys->napi_rx);
 		netif_napi_del(&ep->sys->napi_rx);
 	}
-fail_napi:
 	/* Delete NAPI TX object. */
 	if (ipa3_ctx->tx_napi_enable &&
 		(IPA_CLIENT_IS_PROD(sys_in->client)))

drivers/platform/msm/ipa/ipa_v3/ipa_i.h

@@ -1523,7 +1523,7 @@ struct ipa3_stats {
 	u32 tx_non_linear;
 	u32 rx_page_drop_cnt;
 	struct ipa3_page_recycle_stats page_recycle_stats[3];
-	u64 page_recycle_cnt[2][IPA_PAGE_POLL_THRESHOLD_MAX];
+	u64 page_recycle_cnt[3][IPA_PAGE_POLL_THRESHOLD_MAX];
 };
 
 /* offset for each stats */

drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c

@@ -664,7 +664,7 @@ static void ipa3_del_dflt_wan_rt_tables(void)
 			rt_rule->ip = ip_type;
 			rt_rule_entry->hdl =
 				rmnet_ipa3_ctx->dflt_wan_rt_hdl[ip_type][i];
-			IPAWANERR("Deleting Route hdl:(0x%x) with ip type: %d\n",
+			IPAWANDBG("Deleting Route hdl:(0x%x) with ip type: %d\n",
 				rt_rule_entry->hdl, ip_type);
 			if (ipa3_del_rt_rule(rt_rule) ||
 					(rt_rule_entry->status)) {
@@ -702,7 +702,7 @@ static void ipa3_del_low_lat_rt_rule(void)
 			rt_rule->ip = ip_type;
 			rt_rule_entry->hdl =
 				rmnet_ipa3_ctx->low_lat_rt_hdl[ip_type][i];
-			IPAWANERR("Deleting Route hdl:(0x%x) with ip type: %d\n",
+			IPAWANDBG("Deleting Route hdl:(0x%x) with ip type: %d\n",
 				rt_rule_entry->hdl, ip_type);
 			if (ipa3_del_rt_rule(rt_rule) ||
 					(rt_rule_entry->status)) {
@@ -2813,13 +2813,6 @@ static int ipa3_wwan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 				&ext_ioctl_data,
 				sizeof(struct rmnet_ioctl_extended_s)))
 				rc = -EFAULT;
-			if (copy_from_user(&ext_ioctl_data,
-				(u8 *)ifr->ifr_ifru.ifru_data,
-				sizeof(struct rmnet_ioctl_extended_s))) {
-				IPAWANERR("copy extended ioctl data failed\n");
-				rc = -EFAULT;
-			break;
-			}
 			IPAWANDBG("RMNET_IOCTL_GET_EPID_LL return %d\n",
 					ext_ioctl_data.u.data);
 			break;
@@ -2849,13 +2842,6 @@ static int ipa3_wwan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 				&ext_ioctl_data,
 				sizeof(struct rmnet_ioctl_extended_s)))
 				rc = -EFAULT;
-			if (copy_from_user(&ext_ioctl_data,
-				(u8 *)ifr->ifr_ifru.ifru_data,
-				sizeof(struct rmnet_ioctl_extended_s))) {
-				IPAWANERR("copy extended ioctl data failed\n");
-				rc = -EFAULT;
-				break;
-			}
 			IPAWANDBG("RMNET_IOCTL_GET_EP_PAIR_LL c: %d p: %d\n",
 			ext_ioctl_data.u.ipa_ep_pair.consumer_pipe_num,
 			ext_ioctl_data.u.ipa_ep_pair.producer_pipe_num);