lkml.org 
[lkml]   [2012]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH 1/3] drivers/net: Convert compare_ether_addr to ether_addr_equal
From
Date
(cc's trimmed)

On Thu, 2012-05-10 at 17:32 +0300, Jussi Kivilinna wrote:
> Quoting Joe Perches <joe@perches.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);



\
 
 \ /
  Last update: 2012-05-10 18:41    [W:0.155 / U:0.160 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site