summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2011-05-09 16:33:22 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-10 11:12:22 -0700
commitcf0c3920b4621ed3e70f38510ef419d1cf1afbc9 (patch)
treeb7df5cfac033e227e669c738fa68735cca6a41dd
parenta68ec4892aa9a88e6a0de51a741a6bc902964a8b (diff)
downloadop-kernel-dev-cf0c3920b4621ed3e70f38510ef419d1cf1afbc9.zip
op-kernel-dev-cf0c3920b4621ed3e70f38510ef419d1cf1afbc9.tar.gz
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 <rvossen@broadcoom.com> Reviewed-by: Henry Ptasinski <henryp@broadcom.com> Reviewed-by: Brett Rudley <brudley@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/brcm80211/brcmsmac/wlc_pub.h2
-rw-r--r--drivers/staging/brcm80211/brcmsmac/wlc_scb.h2
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 3dc5b1d..44f6153 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 7326006..f07a891 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 {
OpenPOWER on IntegriCloud