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

Commit e348baa3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: Fix to ignore return value of netif_receive_skb"

parents ba036e53 5b8bdb72

drivers/platform/msm/ipa/ipa_clients/ecm_ipa.c

+2 −4
Original line number Diff line number Diff line
@@ -648,7 +648,6 @@ static void ecm_ipa_packet_receive_notify 
{

	struct sk_buff *skb = (struct sk_buff *)data;

	struct ecm_ipa_dev *ecm_ipa_ctx = priv;

	int result;

	unsigned int packet_len;



	if (!skb) {
@@ -672,9 +671,8 @@ static void ecm_ipa_packet_receive_notify 
	skb->dev = ecm_ipa_ctx->net;

	skb->protocol = eth_type_trans(skb, ecm_ipa_ctx->net);



	result = ecm_ipa_ctx->netif_rx_function(skb);

	if (unlikely(result))

		ECM_IPA_ERROR("fail on netif_rx_function\n");

	ecm_ipa_ctx->netif_rx_function(skb);



	ecm_ipa_ctx->net->stats.rx_packets++;

	ecm_ipa_ctx->net->stats.rx_bytes += packet_len;

}

drivers/platform/msm/ipa/ipa_clients/rndis_ipa.c

+2 −4
Original line number Diff line number Diff line
@@ -1113,7 +1113,6 @@ static void rndis_ipa_packet_receive_notify( 
{

	struct sk_buff *skb = (struct sk_buff *)data;

	struct rndis_ipa_dev *rndis_ipa_ctx = private;

	int result;

	unsigned int packet_len = skb->len;



	RNDIS_IPA_DEBUG
@@ -1149,9 +1148,8 @@ static void rndis_ipa_packet_receive_notify( 
	}



	trace_rndis_netif_ni(skb->protocol);

	result = rndis_ipa_ctx->netif_rx_function(skb);

	if (unlikely(result))

		RNDIS_IPA_ERROR("fail on netif_rx_function\n");

	rndis_ipa_ctx->netif_rx_function(skb);



	rndis_ipa_ctx->net->stats.rx_packets++;

	rndis_ipa_ctx->net->stats.rx_bytes += packet_len;

}