Sujith Manoharan
bd2ce6e43f
mac80211: Add timeout to BA session start API ...
Allow drivers or rate control algorithms to specify BlockAck session
timeout when initiating an ADDBA transaction. This is useful in cases
where maintaining persistent BA sessions does not incur any overhead.
The current timeout value of 5000 TUs is retained for all non ath9k/ath9k_htc
drivers.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2010-12-15 17:03:59 -05:00
Merge branch 'misc' into release
2010-10-26 14:51:00 -04:00
audit: make link()/linkat() match "attribute change" predicate
2010-10-30 08:45:43 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next
2010-10-26 09:23:22 +10:00
nl80211: advertise maximum remain-on-channel duration
2010-12-15 17:03:56 -05:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2010-10-28 09:35:11 -07:00
mtd: Define MLC Flash as a different flash type
2010-10-25 00:50:20 +01:00
mac80211: Add timeout to BA session start API
2010-12-15 17:03:59 -05:00
pcmcia: IOCARD is also required for using IRQs
2010-10-22 08:46:36 +02:00
IB/core: Add VLAN support for IBoE
2010-10-25 10:20:39 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-10-31 20:43:12 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
2010-10-25 08:32:05 -07:00
Merge branch 'next' into upstream-merge
2010-10-27 23:44:47 -04:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
2010-10-28 20:14:38 +01:00
Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2010-10-28 17:11:17 -07:00
bd2ce6e43f