From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 29 Feb 2012 20:08:33 +0000 (-0500)
Subject: carl9170: fix breakage from "mac80211: handle non-bufferable MMPDUs correctly"
X-Git-Tag: v3.4-rc1~177^2~139^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c288ec614e264b46853c65d3db9ccf91d53c9484;p=pandora-kernel.git

carl9170: fix breakage from "mac80211: handle non-bufferable MMPDUs correctly"

That commit intended for 3.4 renamed IEEE80211_TX_CTL_POLL_RESPONSE as
IEEE80211_TX_CTL_NO_PS_BUFFER.  Meanwhile, "carl9170: fix frame delivery
if sta is in powersave mode" added a reference to
IEEE80211_TX_CTL_POLL_RESPONSE in the fixes stream for 3.3.  This simple
patch fixes that merge boo-boo.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed