From 383d71ee4fc30ad374acf25f4dab844112ca4048 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Mon, 9 May 2011 16:33:22 +0200 Subject: [PATCH] --- yaml --- r: 249405 b: refs/heads/master c: cf0c3920b4621ed3e70f38510ef419d1cf1afbc9 h: refs/heads/master i: 249403: 26d85f1718852f6257b214afa4cff63473723a01 v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/wlc_pub.h | 2 ++ trunk/drivers/staging/brcm80211/brcmsmac/wlc_scb.h | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ddcec416579a..4bc0bea0d354 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a68ec4892aa9a88e6a0de51a741a6bc902964a8b +refs/heads/master: cf0c3920b4621ed3e70f38510ef419d1cf1afbc9 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pub.h b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pub.h index 3dc5b1d1576c..44f61538f843 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pub.h +++ b/trunk/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/trunk/drivers/staging/brcm80211/brcmsmac/wlc_scb.h b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_scb.h index 73260068898f..f07a891d5d27 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_scb.h +++ b/trunk/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 {