]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
cfg80211: remove division by size of sizeof(struct ieee80211_wmm_rule)
authorJohannes Berg <johannes.berg@intel.com>
Mon, 18 Jun 2018 07:29:57 +0000 (09:29 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 20 Aug 2018 07:36:33 +0000 (09:36 +0200)
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 <johannes.berg@intel.com>
net/wireless/reg.c

index 4fc66a117b7d74f86a1589a7a02b88f02f203b7d..283902974fbfaa803424ddffeb99bd7dba0892d1 100644 (file)
@@ -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;
 }