diff options
| author | Skylar Chang <chiaweic@codeaurora.org> | 2016-05-04 23:10:48 -0700 |
|---|---|---|
| committer | Jeevan Shriram <jshriram@codeaurora.org> | 2016-05-09 18:35:24 -0700 |
| commit | 0443c0f276fb0c96213ca0f771fcf9c8602ade92 (patch) | |
| tree | 07e95379b2008b4982112d776417afa65ffbc8d3 | |
| parent | 35618cee112744d1d8453ca718af7056bfffa2a1 (diff) | |
msm: ipa3: enable rndis_ipa on msm-4.4
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>
| -rw-r--r-- | drivers/net/ethernet/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/msm/rndis_ipa.c | 18 | ||||
| -rw-r--r-- | include/linux/rndis_ipa.h | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 7d7fe79da74d..34cd0537a6df 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -50,7 +50,7 @@ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ obj-$(CONFIG_NET_VENDOR_MICROCHIP) += microchip/ obj-$(CONFIG_NET_VENDOR_MOXART) += moxa/ -obj-$(CONFIG_ARCH_MSM) += msm/ +obj-$(CONFIG_ARCH_QCOM) += msm/ obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ obj-$(CONFIG_FEALNX) += fealnx.o obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/ diff --git a/drivers/net/ethernet/msm/rndis_ipa.c b/drivers/net/ethernet/msm/rndis_ipa.c index 52ce5536aed5..15cfb1d1dbeb 100644 --- a/drivers/net/ethernet/msm/rndis_ipa.c +++ b/drivers/net/ethernet/msm/rndis_ipa.c @@ -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 * 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 net_device *net; - u32 tx_filter; + bool tx_filter; u32 tx_dropped; - u32 tx_dump_enable; - u32 rx_filter; + bool tx_dump_enable; + bool rx_filter; u32 rx_dropped; - u32 rx_dump_enable; - u32 icmp_filter; - u32 rm_enable; + bool rx_dump_enable; + bool icmp_filter; + bool rm_enable; bool loopback_enable; - u32 deaggregation_enable; - u32 during_xmit_error; + bool deaggregation_enable; + bool during_xmit_error; struct rndis_loopback_pipe usb_to_ipa_loopback_pipe; struct rndis_loopback_pipe ipa_to_usb_loopback_pipe; u32 bam_dma_hdl; diff --git a/include/linux/rndis_ipa.h b/include/linux/rndis_ipa.h index c9e389ddbf2b..9dcb8c30901b 100644 --- a/include/linux/rndis_ipa.h +++ b/include/linux/rndis_ipa.h @@ -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 * 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) { - return 0; + return -ENOMEM; } 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, void *private) { - return 0; + return -ENOMEM; } static inline int rndis_ipa_pipe_disconnect_notify(void *private) { - return 0; + return -ENOMEM; } static inline void rndis_ipa_cleanup(void *private) |