[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1336666288.22495.14.camel@joe2Laptop>
Date: Thu, 10 May 2012 09:11:28 -0700
From: Joe Perches <joe@...ches.com>
To: Jussi Kivilinna <jussi.kivilinna@...et.fi>
Cc: "David S. Miller" <davem@...emloft.net>,
"John W. Linville" <linville@...driver.com>,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-wireless@...r.kernel.org
Subject: Re: [PATCH 1/3] drivers/net: Convert compare_ether_addr to
ether_addr_equal
(cc's trimmed)
On Thu, 2012-05-10 at 17:32 +0300, Jussi Kivilinna wrote:
> Quoting Joe Perches <joe@...ches.com>:
> > Use the new bool function ether_addr_equal to add
> > some clarity and reduce the likelihood for misuse
> > of compare_ether_addr for sorting.
[]
> > diff --git a/drivers/net/wireless/rndis_wlan.c
[]
> > @@ -2139,7 +2139,7 @@ resize_buf:
> > while (check_bssid_list_item(bssid, bssid_len, buf, len)) {
> > if (rndis_bss_info_update(usbdev, bssid) && match_bssid &&
> > matched) {
> > - if (compare_ether_addr(bssid->mac, match_bssid))
> > + if (!ether_addr_equal(bssid->mac, match_bssid))
>
> While reviewing this, noticed that above original code is wrong. It
> should be !compare_ether_addr. So do I push patch fixing this through
> wireless-testing althought it will later cause conflict with this patch?
>
> -Jussi
>
> > *matched = true;
> > }
> >
Up to John.
Here's the patch I would send against net-next
updating the test and the style a little.
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index dcf0e7e..29cccc5 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -2137,11 +2137,10 @@ resize_buf:
* received 'num_items' and walking through full bssid buffer instead.
*/
while (check_bssid_list_item(bssid, bssid_len, buf, len)) {
- if (rndis_bss_info_update(usbdev, bssid) && match_bssid &&
- matched) {
- if (!ether_addr_equal(bssid->mac, match_bssid))
- *matched = true;
- }
+ if (rndis_bss_info_update(usbdev, bssid) &&
+ match_bssid && matched &&
+ ether_addr_equal(bssid->mac, match_bssid))
+ *matched = true;
real_count++;
bssid = next_bssid_list_item(bssid, &bssid_len, buf, len);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists