Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b05f5b4a authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-net-2019-11-08' of... 

Merge tag 'mac80211-for-net-2019-11-08' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Three small fixes:
 * we hit a failure path bug related to
   ieee80211_txq_setup_flows()
 * also use kvmalloc() to make that less likely
 * fix a timing value shortly after boot (during
   INITIAL_JIFFIES)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e4dd5608 285531f9

include/net/fq_impl.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -313,7 +313,7 @@ static int fq_init(struct fq *fq, int flows_cnt) 
	fq->limit = 8192;

	fq->limit = 8192;

	fq->memory_limit = 16 << 20; /* 16 MBytes */

	fq->memory_limit = 16 << 20; /* 16 MBytes */





	fq->flows = kcalloc(fq->flows_cnt, sizeof(fq->flows[0]), GFP_KERNEL);

	fq->flows = kvcalloc(fq->flows_cnt, sizeof(fq->flows[0]), GFP_KERNEL);

	if (!fq->flows)

	if (!fq->flows)

		return -ENOMEM;

		return -ENOMEM;
@@ -331,7 +331,7 @@ static void fq_reset(struct fq *fq, 
	for (i = 0; i < fq->flows_cnt; i++)

	for (i = 0; i < fq->flows_cnt; i++)

		fq_flow_reset(fq, &fq->flows[i], free_func);

		fq_flow_reset(fq, &fq->flows[i], free_func);





	kfree(fq->flows);

	kvfree(fq->flows);

	fq->flows = NULL;

	fq->flows = NULL;

}

}

net/mac80211/main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1292,8 +1292,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 
	ieee80211_remove_interfaces(local);

	ieee80211_remove_interfaces(local);

 fail_rate:

 fail_rate:

	rtnl_unlock();

	rtnl_unlock();

	ieee80211_led_exit(local);

 fail_flows:

 fail_flows:

	ieee80211_led_exit(local);

	destroy_workqueue(local->workqueue);

	destroy_workqueue(local->workqueue);

 fail_workqueue:

 fail_workqueue:

	wiphy_unregister(local->hw.wiphy);

	wiphy_unregister(local->hw.wiphy);

net/mac80211/sta_info.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -2457,7 +2457,8 @@ unsigned long ieee80211_sta_last_active(struct sta_info *sta) 
{

{

	struct ieee80211_sta_rx_stats *stats = sta_get_last_rx_stats(sta);

	struct ieee80211_sta_rx_stats *stats = sta_get_last_rx_stats(sta);





	if (time_after(stats->last_rx, sta->status_stats.last_ack))

	if (!sta->status_stats.last_ack ||

	    time_after(stats->last_rx, sta->status_stats.last_ack))

		return stats->last_rx;

		return stats->last_rx;

	return sta->status_stats.last_ack;

	return sta->status_stats.last_ack;

}

}