2012-03-17 19:13:35

by Joe Perches

Subject: [PATCH 1/2] rtlwifi: Use is_zero_ether_addr, remove line continuation

Use the normal kernel facilities and use %pM
to print the all zero mac address.

Remove unnecessary line continuation.

Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/wireless/rtlwifi/cam.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c
index 5c7d579..3d8cc4a 100644
--- a/drivers/net/wireless/rtlwifi/cam.c
+++ b/drivers/net/wireless/rtlwifi/cam.c
@@ -328,10 +328,9 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr)
RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, "sta_addr is NULL\n");
}

- if ((sta_addr[0]|sta_addr[1]|sta_addr[2]|sta_addr[3]|\
- sta_addr[4]|sta_addr[5]) == 0) {
+ if (is_zero_ether_addr(sta_addr)) {
RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,
- "sta_addr is 00:00:00:00:00:00\n");
+ "sta_addr is %pM\n", sta_addr);
return;
}
/* Does STA already exist? */
--
1.7.8.111.gad25c.dirty

2012-03-17 21:19:43

by David Miller

Subject: Re: [PATCH 1/2] rtlwifi: Use is_zero_ether_addr, remove line continuation

From: Larry Finger <[email protected]>
Date: Sat, 17 Mar 2012 16:14:53 -0500

> On 03/17/2012 02:13 PM, Joe Perches wrote:
>> Use the normal kernel facilities and use %pM
>> to print the all zero mac address.
>>
>> Remove unnecessary line continuation.
>>
>> Signed-off-by: Joe Perches<[email protected]>
>> ---
>> drivers/net/wireless/rtlwifi/cam.c | 5 ++---
>> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> ACKed-by: [email protected]
>
> Is there a PATCH 2/2? I did not receive it.

It went to netdev only and was only for non-wireless networking
drivers.

2012-03-17 21:18:26

by Joe Perches

Subject: Re: [PATCH 1/2] rtlwifi: Use is_zero_ether_addr, remove line continuation

On Sat, 2012-03-17 at 16:14 -0500, Larry Finger wrote:
> Is there a PATCH 2/2? I did not receive it.

Yes.
It's a line continuation removal patch to other files.
https://lkml.org/lkml/2012/3/17/72

2012-03-17 21:14:56

by Larry Finger

Subject: Re: [PATCH 1/2] rtlwifi: Use is_zero_ether_addr, remove line continuation

On 03/17/2012 02:13 PM, Joe Perches wrote:
> Use the normal kernel facilities and use %pM
> to print the all zero mac address.
>
> Remove unnecessary line continuation.
>
> Signed-off-by: Joe Perches<[email protected]>
> ---
> drivers/net/wireless/rtlwifi/cam.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)

ACKed-by: [email protected]

Is there a PATCH 2/2? I did not receive it.

Larry

>
> diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c
> index 5c7d579..3d8cc4a 100644
> --- a/drivers/net/wireless/rtlwifi/cam.c
> +++ b/drivers/net/wireless/rtlwifi/cam.c
> @@ -328,10 +328,9 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr)
> RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, "sta_addr is NULL\n");
> }
>
> - if ((sta_addr[0]|sta_addr[1]|sta_addr[2]|sta_addr[3]|\
> - sta_addr[4]|sta_addr[5]) == 0) {
> + if (is_zero_ether_addr(sta_addr)) {
> RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,
> - "sta_addr is 00:00:00:00:00:00\n");
> + "sta_addr is %pM\n", sta_addr);
> return;
> }
> /* Does STA already exist? */