From: Johannes Berg Date: Mon, 18 Jun 2018 07:29:57 +0000 (+0200) Subject: cfg80211: remove division by size of sizeof(struct ieee80211_wmm_rule) X-Git-Tag: v4.18.13~163 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0d6ba1ecba26c8033bc4adc5f9723d029f524131;p=users%2Fdwmw2%2Flinux.git cfg80211: remove division by size of sizeof(struct ieee80211_wmm_rule) [ Upstream commit 8a54d8fc160e67ad485d95a0322ce1221f80770a ] Pointer arithmetic already adjusts by the size of the struct, so the sizeof() calculation is wrong. This is basically the same as Colin King's patch for similar code in the iwlwifi driver. Fixes: 230ebaa189af ("cfg80211: read wmm rules from regulatory database") Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 4fc66a117b7d7..283902974fbfa 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -452,8 +452,7 @@ reg_copy_regd(const struct ieee80211_regdomain *src_regd) continue; regd->reg_rules[i].wmm_rule = d_wmm + - (src_regd->reg_rules[i].wmm_rule - s_wmm) / - sizeof(struct ieee80211_wmm_rule); + (src_regd->reg_rules[i].wmm_rule - s_wmm); } return regd; }