Merge "msm: ipa3: remove odu_bridge functions from ipa.h" (501823c5) · Commits · e / devices / android_kernel_xiaomi_markw

include/linux/ipa.h

+0 −68

Original line number	Diff line number	Diff line
		@@ -1037,30 +1037,6 @@ struct ipa_wdi_buffer_info {
		int result;
		};

		/**
		* struct odu_bridge_params - parameters for odu bridge initialization API
		*
		* @netdev_name: network interface name
		* @priv: private data that will be supplied to client's callback
		* @tx_dp_notify: callback for handling SKB. the following event are supported:
		* IPA_WRITE_DONE: will be called after client called to odu_bridge_tx_dp()
		* Client is expected to free the skb.
		* IPA_RECEIVE: will be called for delivering skb to APPS.
		* Client is expected to deliver the skb to network stack.
		* @send_dl_skb: callback for sending skb on downlink direction to adapter.
		* Client is expected to free the skb.
		* @device_ethaddr: device Ethernet address in network order.
		* @ipa_desc_size: IPA Sys Pipe Desc Size
		*/
		struct odu_bridge_params {
		const char *netdev_name;
		void *priv;
		ipa_notify_cb tx_dp_notify;
		int (send_dl_skb)(void priv, struct sk_buff *skb);
		u8 device_ethaddr[ETH_ALEN];
		u32 ipa_desc_size;
		};

		/**
		* enum ipa_mhi_event_type - event type for mhi callback
		*
		@@ -1423,20 +1399,6 @@ enum ipacm_client_enum ipa_get_client(int pipe_idx);

		bool ipa_get_client_uplink(int pipe_idx);

		/*
		* ODU bridge
		*/

		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);

		/*
		* IPADMA
		*/
		@@ -2090,36 +2052,6 @@ static inline bool ipa_get_client_uplink(int pipe_idx)
		return -EPERM;
		}


		/*
		* ODU bridge
		*/
		static inline int odu_bridge_init(struct odu_bridge_params *params)
		{
		return -EPERM;
		}

		static inline int odu_bridge_disconnect(void)
		{
		return -EPERM;
		}

		static inline int odu_bridge_connect(void)
		{
		return -EPERM;
		}

		static inline int odu_bridge_tx_dp(struct sk_buff *skb,
		struct ipa_tx_meta *metadata)
		{
		return -EPERM;
		}

		static inline int odu_bridge_cleanup(void)
		{
		return -EPERM;
		}

		/*
		* IPADMA
		*/

include/linux/ipa_odu_bridge.h

+52 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,30 @@
		#ifndef _IPA_ODO_BRIDGE_H_
		#define _IPA_ODO_BRIDGE_H_

		/**
		* struct odu_bridge_params - parameters for odu bridge initialization API
		*
		* @netdev_name: network interface name
		* @priv: private data that will be supplied to client's callback
		* @tx_dp_notify: callback for handling SKB. the following event are supported:
		* IPA_WRITE_DONE: will be called after client called to odu_bridge_tx_dp()
		* Client is expected to free the skb.
		* IPA_RECEIVE: will be called for delivering skb to APPS.
		* Client is expected to deliver the skb to network stack.
		* @send_dl_skb: callback for sending skb on downlink direction to adapter.
		* Client is expected to free the skb.
		* @device_ethaddr: device Ethernet address in network order.
		* @ipa_desc_size: IPA Sys Pipe Desc Size
		*/
		struct odu_bridge_params {
		const char *netdev_name;
		void *priv;
		ipa_notify_cb tx_dp_notify;
		int (send_dl_skb)(void priv, struct sk_buff *skb);
		u8 device_ethaddr[ETH_ALEN];
		u32 ipa_desc_size;
		};

		#if defined CONFIG_IPA \|\| defined CONFIG_IPA3

		int odu_bridge_init(struct odu_bridge_params *params);
		@@ -25,6 +49,34 @@ int odu_bridge_tx_dp(struct sk_buff skb, struct ipa_tx_meta metadata);

		int odu_bridge_cleanup(void);

		#else

		static inline int odu_bridge_init(struct odu_bridge_params *params)
		{
		return -EPERM;
		}

		static inline int odu_bridge_disconnect(void)
		{
		return -EPERM;
		}

		static inline int odu_bridge_connect(void)
		{
		return -EPERM;
		}

		static inline int odu_bridge_tx_dp(struct sk_buff *skb,
		struct ipa_tx_meta *metadata)
		{
		return -EPERM;
		}

		static inline int odu_bridge_cleanup(void)
		{
		return -EPERM;
		}

		#endif /* CONFIG_IPA \|\| defined CONFIG_IPA3 */

		#endif /* _IPA_ODO_BRIDGE_H */