Date: Sun, 07 Sep 2014 16:11:33 -0700 (PDT)
Message-Id: <20140907.161133.1026363467035732296.davem@davemloft.net> (sfid-20140908_011154_178304_ACB5DB7B)
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: pull request: wireless 2014-09-05
From: David Miller <davem@davemloft.net>
In-Reply-To: <20140905150453.GB3454@tuxdriver.com>
References: <20140905150453.GB3454@tuxdriver.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Sender: linux-wireless-owner@vger.kernel.org

From: "John W. Linville" <linville@tuxdriver.com>
Date: Fri, 5 Sep 2014 11:04:53 -0400

> Please pull this batch of fixes intended for the 3.17 stream...
> 
> For the mac80211 bits, Johannes says:
> 
> "Here are a few fixes for mac80211. One has been discussed for a while
> and adds a terminating NUL-byte to the alpha2 sent to userspace, which
> shouldn't be necessary but since many places treat it as a string we
> couldn't move to just sending two bytes.
> 
> In addition to that, we have two VLAN fixes from Felix, a mesh fix, a
> fix for the recently introduced RX aggregation offload, a revert for
> a broken patch (that luckily didn't really cause any harm) and a small
> fix for alignment in debugfs."
> 
> For the iwlwifi bits, Emmanuel says:
> 
> "I revert a patch that disabled CTS to self in dvm because users
> reported issues. The revert is CCed to stable since the offending
> patch was sent to stable too. I also bump the firmware API versions
> since a new firmware is coming up. On top of that, Marcel fixes a
> bug I introduced while fixing a bug in our Kconfig file."
> 
> Please let me know if there are problems!

Pulled, thanks John.