On 03-08-17 15:25, Maya Erez wrote:
> From: Gidon Studinski <[email protected]>
>
> Since debugfs is a kernel configuration option, enable the driver to
> compile without debugfs.
>
> Signed-off-by: Gidon Studinski <[email protected]>
> Signed-off-by: Maya Erez <[email protected]>
> ---
> drivers/net/wireless/ath/wil6210/Makefile | 2 +-
> drivers/net/wireless/ath/wil6210/debugfs.c | 6 ++----
> drivers/net/wireless/ath/wil6210/main.c | 1 +
> drivers/net/wireless/ath/wil6210/txrx.c | 6 +++---
> drivers/net/wireless/ath/wil6210/wil6210.h | 8 +++++++-
> 5 files changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/wil6210/Makefile
> b/drivers/net/wireless/ath/wil6210/Makefile
> index 4ae21da..63a751a 100644
> --- a/drivers/net/wireless/ath/wil6210/Makefile
> +++ b/drivers/net/wireless/ath/wil6210/Makefile
> @@ -4,7 +4,7 @@ wil6210-y := main.o
> wil6210-y += netdev.o
> wil6210-y += cfg80211.o
> wil6210-y += pcie_bus.o
> -wil6210-y += debugfs.o
> +wil6210-$(CONFIG_DEBUG_FS) += debugfs.o
This looks good, but ....
> wil6210-y += wmi.o
> wil6210-y += interrupt.o
> wil6210-y += txrx.o
[...]
> diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h
> b/drivers/net/wireless/ath/wil6210/wil6210.h
> index e3c0c2f..d7b1e03 100644
> --- a/drivers/net/wireless/ath/wil6210/wil6210.h
> +++ b/drivers/net/wireless/ath/wil6210/wil6210.h
> @@ -30,7 +30,6 @@
> extern unsigned int mtu_max;
> extern unsigned short rx_ring_overflow_thrsh;
> extern int agg_wsize;
> -extern u32 vring_idle_trsh;
> extern bool rx_align_2;
> extern bool rx_large_buf;
> extern bool debug_fw;
> @@ -693,6 +692,7 @@ struct wil6210_priv {
> u8 vring2cid_tid[WIL6210_MAX_TX_RINGS][2]; /* [0] - CID, [1] - TID */
> struct wil_sta_info sta[WIL6210_MAX_CID];
> int bcast_vring;
> + u32 vring_idle_trsh; /* HW fetches up to 16 descriptors at once */
this vring stuff seems worth a separate patch (or I am simply
misunderstanding it).
Regards,
Arend
> bool use_extended_dma_addr; /* indicates whether we are using 48 bits */
> /* scan */
> struct cfg80211_scan_request *scan_request;
