evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: ipa3: enable rndis_ipa on msm-4.4

Browse source 
Change the feature flag to compile rndis_ipa
on cobalt target with msm-4.4 kernel, also
fix the compile warnings.

Change-Id: I82d3dd00e003d8eab63ca6bcc3bb91d51f122606
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
This commit is contained in:
Skylar Chang 2016-05-04 23:10:48 -07:00 • committed by Jeevan Shriram
parent 35618cee11
commit 0443c0f276
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/ethernet/Makefile
View file

@ -50,7 +50,7 @@ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
obj-$(CONFIG_NET_VENDOR_MICROCHIP) += microchip/ obj-$(CONFIG_NET_VENDOR_MICROCHIP) += microchip/
obj-$(CONFIG_NET_VENDOR_MOXART) += moxa/ obj-$(CONFIG_NET_VENDOR_MOXART) += moxa/
obj-$(CONFIG_ARCH_MSM) += msm/ obj-$(CONFIG_ARCH_QCOM) += msm/
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
obj-$(CONFIG_FEALNX) += fealnx.o obj-$(CONFIG_FEALNX) += fealnx.o
obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/ obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/

18
drivers/net/ethernet/msm/rndis_ipa.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved. /* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -200,17 +200,17 @@ struct rndis_loopback_pipe {
*/ */
struct rndis_ipa_dev { struct rndis_ipa_dev {
struct net_device *net; struct net_device *net;
u32 tx_filter; bool tx_filter;
u32 tx_dropped; u32 tx_dropped;
u32 tx_dump_enable; bool tx_dump_enable;
u32 rx_filter; bool rx_filter;
u32 rx_dropped; u32 rx_dropped;
u32 rx_dump_enable; bool rx_dump_enable;
u32 icmp_filter; bool icmp_filter;
u32 rm_enable; bool rm_enable;
bool loopback_enable; bool loopback_enable;
u32 deaggregation_enable; bool deaggregation_enable;
u32 during_xmit_error; bool during_xmit_error;
struct rndis_loopback_pipe usb_to_ipa_loopback_pipe; struct rndis_loopback_pipe usb_to_ipa_loopback_pipe;
struct rndis_loopback_pipe ipa_to_usb_loopback_pipe; struct rndis_loopback_pipe ipa_to_usb_loopback_pipe;
u32 bam_dma_hdl; u32 bam_dma_hdl;

8
include/linux/rndis_ipa.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. /* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -75,7 +75,7 @@ void rndis_ipa_cleanup(void *private);
static inline int rndis_ipa_init(struct ipa_usb_init_params *params) static inline int rndis_ipa_init(struct ipa_usb_init_params *params)
{ {
return 0; return -ENOMEM;
} }
static inline int rndis_ipa_pipe_connect_notify(u32 usb_to_ipa_hdl, static inline int rndis_ipa_pipe_connect_notify(u32 usb_to_ipa_hdl,
@ -85,12 +85,12 @@ static inline int rndis_ipa_pipe_connect_notify(u32 usb_to_ipa_hdl,
u32 max_xfer_size_bytes_to_host, u32 max_xfer_size_bytes_to_host,
void *private) void *private)
{ {
return 0; return -ENOMEM;
} }
static inline int rndis_ipa_pipe_disconnect_notify(void *private) static inline int rndis_ipa_pipe_disconnect_notify(void *private)
{ {
return 0; return -ENOMEM;
} }
static inline void rndis_ipa_cleanup(void *private) static inline void rndis_ipa_cleanup(void *private)