From cf0c3920b4621ed3e70f38510ef419d1cf1afbc9 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Mon, 9 May 2011 16:33:22 +0200 Subject: [PATCH] staging: brcm80211: wlc_aggregatable function prototype moved The function wlc_aggregatable is used by wl_mac80211.c. The prototype of the function was placed in include file wlc_scb.h but the interface for wl_mac80211.c to other driver functions is to be placed in wlc_pub.h. Cc: devel@linuxdriverproject.org Cc: linux-wireless@vger.kernel.org Reviewed-by: Roland Vossen Reviewed-by: Henry Ptasinski Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/brcmsmac/wlc_pub.h | 2 ++ drivers/staging/brcm80211/brcmsmac/wlc_scb.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_pub.h b/drivers/staging/brcm80211/brcmsmac/wlc_pub.h index 3dc5b1d1576c..44f61538f843 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_pub.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_pub.h @@ -514,6 +514,8 @@ extern int wlc_iovar_op(struct wlc_info *wlc, const char *name, void *params, struct wlc_if *wlcif); extern int wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif); +extern bool wlc_aggregatable(struct wlc_info *wlc, u8 tid); + /* helper functions */ extern void wlc_statsupd(struct wlc_info *wlc); extern void wlc_protection_upd(struct wlc_info *wlc, uint idx, int val); diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_scb.h b/drivers/staging/brcm80211/brcmsmac/wlc_scb.h index 73260068898f..f07a891d5d27 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_scb.h +++ b/drivers/staging/brcm80211/brcmsmac/wlc_scb.h @@ -17,8 +17,6 @@ #ifndef _wlc_scb_h_ #define _wlc_scb_h_ -extern bool wlc_aggregatable(struct wlc_info *wlc, u8 tid); - #define AMPDU_TX_BA_MAX_WSIZE 64 /* max Tx ba window size (in pdu) */ /* structure to store per-tid state for the ampdu initiator */ typedef struct scb_ampdu_tid_ini { -- 2.34.1