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

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

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

parents 1cc79b99 b1d48001

arch/arm/mach-msm/include/mach/rndis_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 (*ipa_callback)(void *priv, 
 * @private: The network driver will set this pointer (out parameter).

 * This pointer will hold the network device for later interaction

 * with between USB driver and the network driver.

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

 *  should or should not configure this end-point.

 */

struct ipa_usb_init_params {

	ipa_callback ipa_rx_notify;
@@ -47,6 +49,7 @@ struct ipa_usb_init_params { 
	u8 host_ethaddr[ETH_ALEN];

	u8 device_ethaddr[ETH_ALEN];

	void *private;

	bool skip_ep_cfg;

};



#ifdef CONFIG_RNDIS_IPA

drivers/net/ethernet/msm/rndis_ipa.c

+1 −0
Original line number Diff line number Diff line
@@ -549,6 +549,7 @@ int rndis_ipa_init(struct ipa_usb_init_params *params) 
	params->ipa_rx_notify = rndis_ipa_packet_receive_notify;

	params->ipa_tx_notify = rndis_ipa_tx_complete_notify;

	params->private = rndis_ipa_ctx;

	params->skip_ep_cfg = false;

	rndis_ipa_ctx->state = RNDIS_IPA_INITIALIZED;

	RNDIS_IPA_STATE_DEBUG(rndis_ipa_ctx);

	pr_info("RNDIS_IPA NetDev was initialized");