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

Commit 1cc79b99 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ecm_ipa: add differentiation for EP config"

parents f8b2fb2f 25d56ed4

arch/arm/mach-msm/include/mach/ecm_ipa.h

+4 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -40,6 +40,8 @@ typedef void (*ecm_ipa_callback)(void *priv, 
 * with ecm_ipa APIs

 * @host_ethaddr: host Ethernet address in network order

 * @device_ethaddr: device Ethernet address in network order

 * @skip_ep_cfg: boolean field that determines if Apps-processor

 *  should or should not configure this end-point.

 */

struct ecm_ipa_params {

	ecm_ipa_callback ecm_ipa_rx_dp_notify;
@@ -47,6 +49,7 @@ struct ecm_ipa_params { 
	u8 host_ethaddr[ETH_ALEN];

	u8 device_ethaddr[ETH_ALEN];

	void *private;

	bool skip_ep_cfg;

};

drivers/net/ethernet/msm/ecm_ipa.c

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -299,6 +299,7 @@ int ecm_ipa_init(struct ecm_ipa_params *params) 
	params->ecm_ipa_rx_dp_notify = ecm_ipa_packet_receive_notify;

	params->ecm_ipa_tx_dp_notify = ecm_ipa_tx_complete_notify;

	params->private = (void *)ecm_ipa_ctx;

	params->skip_ep_cfg = false;

	ecm_ipa_ctx->state = ECM_IPA_INITIALIZED;

	ECM_IPA_STATE_DEBUG(ecm_ipa_ctx);