From 1bdae45c76891d68cabd9808a137acaf1a2d2a0e Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 4 Dec 2012 12:49:16 +0100 Subject: [PATCH] --- yaml --- r: 351725 b: refs/heads/master c: 82f20856304319d5a931846e0269eb911d52a905 h: refs/heads/master i: 351723: 34158d4189dd623b95741e8bf0c660f981346176 v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2a0b03e8e2c9..4fd202b283b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a57fff0c178febbe28669a0ef68a8e3460a7589 +refs/heads/master: 82f20856304319d5a931846e0269eb911d52a905 diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index 40646e823d5d..62bf212e5648 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -318,8 +318,9 @@ static int reg_copy_regd(const struct ieee80211_regdomain **dst_regd, int size_of_regd = 0; unsigned int i; - size_of_regd = sizeof(struct ieee80211_regdomain) + - ((src_regd->n_reg_rules + 1) * sizeof(struct ieee80211_reg_rule)); + size_of_regd = + sizeof(struct ieee80211_regdomain) + + src_regd->n_reg_rules * sizeof(struct ieee80211_reg_rule); regd = kzalloc(size_of_regd, GFP_KERNEL); if (!regd) @@ -641,7 +642,7 @@ static struct ieee80211_regdomain *regdom_intersect( return NULL; size_of_regd = sizeof(struct ieee80211_regdomain) + - ((num_rules + 1) * sizeof(struct ieee80211_reg_rule)); + num_rules * sizeof(struct ieee80211_reg_rule); rd = kzalloc(size_of_regd, GFP_KERNEL); if (!rd)