Merge "msm: ipa3: add odu_bridge to ipa_clients folder" (2e7b793b) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/usb/usbnet.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@
		#include <linux/pm_runtime.h>
		#include <linux/debugfs.h>
		#include <linux/types.h>
		#include <linux/ipa.h>
		#include <linux/ipa_odu_bridge.h>
		#define DRIVER_VERSION "22-Aug-2005"

drivers/platform/msm/ipa/Makefile

+1 −1

Original line number	Diff line number	Diff line
		obj-$(CONFIG_IPA) += ipa_v2/
		obj-$(CONFIG_IPA) += ipa_v2/ ipa_clients/
		obj-$(CONFIG_IPA3) += ipa_v3/ ipa_clients/

		obj-$(CONFIG_IPA) += ipa_api.o

drivers/platform/msm/ipa/ipa_api.c

+0 −102

Original line number	Diff line number	Diff line
		@@ -1867,108 +1867,6 @@ bool ipa_get_client_uplink(int pipe_idx)
		}
		EXPORT_SYMBOL(ipa_get_client_uplink);

		/**
		* odu_bridge_init() - Initialize the ODU bridge driver
		* @params: initialization parameters
		*
		* This function initialize all bridge internal data and register odu bridge to
		* kernel for IOCTL and debugfs.
		* Header addition and properties are registered to IPA driver.
		*
		* Return codes: 0: success,
		* -EINVAL - Bad parameter
		* Other negative value - Failure
		*/
		int odu_bridge_init(struct odu_bridge_params *params)
		{
		int ret;

		IPA_API_DISPATCH_RETURN(odu_bridge_init, params);

		return ret;
		}
		EXPORT_SYMBOL(odu_bridge_init);

		/**
		* odu_bridge_disconnect() - Disconnect odu bridge
		*
		* Disconnect all pipes and deletes IPA RM dependencies on bridge mode
		*
		* Return codes: 0- success, error otherwise
		*/
		int odu_bridge_disconnect(void)
		{
		int ret;

		IPA_API_DISPATCH_RETURN(odu_bridge_disconnect);

		return ret;
		}
		EXPORT_SYMBOL(odu_bridge_disconnect);

		/**
		* odu_bridge_connect() - Connect odu bridge.
		*
		* Call to the mode-specific connect function for connection IPA pipes
		* and adding IPA RM dependencies

		* Return codes: 0: success
		* -EINVAL: invalid parameters
		* -EPERM: Operation not permitted as the bridge is already
		* connected
		*/
		int odu_bridge_connect(void)
		{
		int ret;

		IPA_API_DISPATCH_RETURN(odu_bridge_connect);

		return ret;
		}
		EXPORT_SYMBOL(odu_bridge_connect);

		/**
		* odu_bridge_tx_dp() - Send skb to ODU bridge
		* @skb: skb to send
		* @metadata: metadata on packet
		*
		* This function handles uplink packet.
		* In Router Mode:
		* packet is sent directly to IPA.
		* In Router Mode:
		* packet is classified if it should arrive to network stack.
		* QMI IP packet should arrive to APPS network stack
		* IPv6 Multicast packet should arrive to APPS network stack and Q6
		*
		* Return codes: 0- success, error otherwise
		*/
		int odu_bridge_tx_dp(struct sk_buff skb, struct ipa_tx_meta metadata)
		{
		int ret;

		IPA_API_DISPATCH_RETURN(odu_bridge_tx_dp, skb, metadata);

		return ret;
		}
		EXPORT_SYMBOL(odu_bridge_tx_dp);

		/**
		* odu_bridge_cleanup() - De-Initialize the ODU bridge driver
		*
		* Return codes: 0: success,
		* -EINVAL - Bad parameter
		* Other negative value - Failure
		*/
		int odu_bridge_cleanup(void)
		{
		int ret;

		IPA_API_DISPATCH_RETURN(odu_bridge_cleanup);

		return ret;
		}
		EXPORT_SYMBOL(odu_bridge_cleanup);

		/**
		* ipa_dma_init() -Initialize IPADMA.
		*

drivers/platform/msm/ipa/ipa_api.h

+0 −11

Original line number	Diff line number	Diff line
		@@ -236,17 +236,6 @@ struct ipa_api_controller {

		bool (*ipa_get_client_uplink)(int pipe_idx);

		int (odu_bridge_init)(struct odu_bridge_params params);

		int (*odu_bridge_connect)(void);

		int (*odu_bridge_disconnect)(void);

		int (odu_bridge_tx_dp)(struct sk_buff skb,
		struct ipa_tx_meta *metadata);

		int (*odu_bridge_cleanup)(void);

		int (*ipa_dma_init)(void);

		int (*ipa_dma_enable)(void);

drivers/platform/msm/ipa/ipa_clients/Makefile

+2 −1

Original line number	Diff line number	Diff line
		obj-$(CONFIG_IPA3) += ipa_usb.o
		No newline at end of file
		obj-$(CONFIG_IPA3) += ipa_usb.o odu_bridge.o
		obj-$(CONFIG_IPA) += odu_bridge.o
		No newline at end of file