| Message ID | 0036538d0933626a1a5eb2c2c3935cf173028926.1646250537.git.chunkeey@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e42fe43a216cab59b6cc0cba96ec23db2d81a5d4 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v1,1/5] carl9170: replace GFP_ATOMIC in ampdu_action, it can sleep | expand |
Christian Lamparter <chunkeey@gmail.com> wrote: > Since ~2010, the driver is allowed to sleep in the ampdu_action > callback thanks to: > commit 85ad181ea788 ("mac80211: allow drivers to sleep in ampdu_action") > > Signed-off-by: Christian Lamparter <chunkeey@gmail.com> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> 5 patches applied to ath-next branch of ath.git, thanks. e42fe43a216c carl9170: replace GFP_ATOMIC in ampdu_action, it can sleep 23de0fa0d2a0 carl9170: devres-ing hwrng_register usage 87ddb2fc29f1 carl9170: devres-ing input_allocate_device a8da65f901fa carl9170: replace bitmap_zalloc with devm_bitmap_zalloc 83fe43abdacf carl9170: devres ar->survey_info
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c index 2208ec800482..f6974aff0c59 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c @@ -1412,7 +1412,7 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw, return -EOPNOTSUPP; tid_info = kzalloc(sizeof(struct carl9170_sta_tid), - GFP_ATOMIC); + GFP_KERNEL); if (!tid_info) return -ENOMEM;
Since ~2010, the driver is allowed to sleep in the ampdu_action callback thanks to: commit 85ad181ea788 ("mac80211: allow drivers to sleep in ampdu_action") Signed-off-by: Christian Lamparter <chunkeey@gmail.com> --- drivers/net/wireless/ath/carl9170/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)