diff --git a/[refs] b/[refs] index 6d910f748b1e..62decd233682 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4cbdbca020bd26dde0feb2a7511ae14fd394faf6 +refs/heads/master: d3f54f319a6145241c37663f0e21b10888ee0920 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c index c6cdcd940956..3b2b554c0dbf 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c @@ -687,7 +687,10 @@ wlc_sendampdu(struct ampdu_info *ampdu, struct wlc_txq_info *qi, WL_NONE("sendampdu: sgi %d, is40 %d, mcs %d\n", sgi, is40, mcs); - maxlen = 64 * 1024; /* XXX Fix me to honor real max_rxlen */ + /* XXX Fix me to honor real max_rxlen */ + /* can fix this as soon as ampdu_action() in mac80211.h + * gets extra u8buf_size par */ + maxlen = 64 * 1024; if (is40) mimo_ctlchbw =