Hi all, Today's linux-next merge of the net-next tree got a conflict in net/mac80211/cfg.c between commit fa8f136fe9a8 ("mac80211: fix crash on getting sta info with uninitialized rate control") from the wireless tree and commit b7ffbd7ef675 ("cfg80211: make ethtool the driver's responsibility") from the net-next tree. I fixed it up (the latter moved the code modified by the former, so I removed the code and added the following patch) and can carry the fix as necessary (no action is required). From: Stephen Rothwell Date: Thu, 24 Jul 2014 12:32:49 +1000 Subject: [PATCH] mac80211: fix for code movement Signed-off-by: Stephen Rothwell --- net/mac80211/sta_info.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index f41177f58b30..c6ee2139fbc5 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -1724,12 +1724,15 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) { struct ieee80211_sub_if_data *sdata = sta->sdata; struct ieee80211_local *local = sdata->local; - struct rate_control_ref *ref = local->rate_ctrl; + struct rate_control_ref *ref = NULL; struct timespec uptime; u64 packets = 0; u32 thr = 0; int i, ac; + if (test_sta_flag(sta, WLAN_STA_RATE_CONTROL)) + ref = local->rate_ctrl; + sinfo->generation = sdata->local->sta_generation; sinfo->filled = STATION_INFO_INACTIVE_TIME | -- 2.0.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au