Yogesh Ashok Powar
8b3becadc8
cfg80211: make stripping of 802.11 header optional from AMSDU ...
Currently the devices that have already stripped IEEE 802.11
header from the AMSDU SKB can not use ieee80211_amsdu_to_8023s
routine. This patch enhances ieee80211_amsdu_to_8023s() API by
changing mandatory removing of IEEE 802.11 header from AMSDU
to optional.
Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-05-16 14:10:50 -04:00
Merge branch 'linus' into release
2011-03-23 02:34:54 -04:00
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-03-25 17:52:22 -07:00
drm/vblank: update recently added vbl interface to be more future proof.
2011-03-24 21:28:46 +10:00
nl80211: Move peer link state definition to nl80211
2011-05-16 14:10:49 -04:00
[media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
2011-03-22 19:41:58 -03:00
cfg80211: make stripping of 802.11 header optional from AMSDU
2011-05-16 14:10:50 -04:00
[SCSI] libiscsi_tcp: use kmap in xmit path
2011-03-23 11:36:58 -05:00
ALSA: vmalloc buffers should use normal mmap
2011-03-25 11:13:12 +01:00
[media] Altera FPGA firmware download module
2011-03-21 20:32:16 -03:00
[SCSI] target: add initial statistics
2011-03-23 11:36:50 -05:00
Merge branch 'for-linus-unmerged' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
2011-03-28 15:31:05 -07:00
atmel_lcdfb: implement inverted contrast pwm
2011-03-22 16:23:44 +09:00
Merge branch 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2011-03-17 18:37:42 -07:00
8b3becadc8