From: David S. Miller Date: Wed, 31 Oct 2012 18:59:01 +0000 (-0400) Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... X-Git-Tag: v3.7-rc4~5^2~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aff9c78618295b265add4967d1eff0bc78490d9d;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge branch 'for-davem' of git://git./linux/kernel/git/linville/wireless John W. Linville says: ==================== This is a batch of fixes intended for 3.7... The biggest portion of this is a pull request from Johannes Berg: "Please pull my mac80211.git tree per below to get a number of fixes. I have included a patch from Antonio to fix a memcpy overrun, Felix's patches for the antenna gain/tx power issues, a few mesh-related fixes from Javier for mac80211 and my own patches to not access data that might not be present in an skb at all as well as a patch (the duplicate IE check one) to make mac80211 forward-compatible with potential future spec extensions that use the same IE multiple times. It's a bit bigger than I'd like maybe, but I think all of these are worthwhile fixes at this point." In addition... Felix Fietkau fixes an ath9k use-after-free issue. Stanislaw Gruszka adds a valid value check to rt2800. Sven Eckelmann adds a check to only check a TID value in a BlockAck, for frames that could be either a BlockAck or a normal Ack. ==================== Signed-off-by: David S. Miller --- aff9c78618295b265add4967d1eff0bc78490d9d