2011-04-26 04:39:01

by jiaweiwei

[permalink] [raw]
Subject: [PATCH]Remove a warning

Hi us,
When i was compiling kernel, a warning happened to me.
The warning said like following.

drivers/staging/wlan-ng/cfg80211.c:709: warning: initialization from
incompatible pointer type

So i patched like this.

From: Harry Wei <[email protected]>

Signed-off-by: Harry Wei <[email protected]>
---
drivers/staging/wlan-ng/cfg80211.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
index 6a71f52..7637839 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -273,7 +273,7 @@ exit:
}

int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev,
- u8 key_index)
+ u8 key_index, bool unicast, bool multicast)
{
wlandevice_t *wlandev = dev->ml_priv;

--
1.7.0.4



2011-04-26 07:08:21

by jiaweiwei

[permalink] [raw]
Subject: Re: [PATCH]Remove a warning

On Tue, Apr 26, 2011 at 12:38:37PM +0800, Harry Wei wrote:
> Hi us,
> When i was compiling kernel, a warning happened to me.
> The warning said like following.
>
> drivers/staging/wlan-ng/cfg80211.c:709: warning: initialization from
> incompatible pointer type
See http://s1202.photobucket.com/albums/bb364/harrywei/?action=view&current=patched2.png
for more details.
>
> So i patched like this.
>
> From: Harry Wei <[email protected]>
>
> Signed-off-by: Harry Wei <[email protected]>
> ---
> drivers/staging/wlan-ng/cfg80211.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
> index 6a71f52..7637839 100644
> --- a/drivers/staging/wlan-ng/cfg80211.c
> +++ b/drivers/staging/wlan-ng/cfg80211.c
> @@ -273,7 +273,7 @@ exit:
> }
>
> int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev,
> - u8 key_index)
> + u8 key_index, bool unicast, bool multicast)
> {
> wlandevice_t *wlandev = dev->ml_priv;
>
> --
> 1.7.0.4
>
>
>

2011-04-26 13:08:56

by Wanlong Gao

[permalink] [raw]
Subject: Re: [PATCH]Remove a warning

>>On Tue, Apr 26, 2011 at 12:38:37PM +0800, Harry Wei wrote:

>> Signed-off-by: Harry Wei <[email protected]>
>> ---
>> drivers/staging/wlan-ng/cfg80211.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/staging/wlan-ng/cfg80211.c
>> b/drivers/staging/wlan-ng/cfg80211.c
>> index 6a71f52..7637839 100644
>> --- a/drivers/staging/wlan-ng/cfg80211.c
>> +++ b/drivers/staging/wlan-ng/cfg80211.c
>> @@ -273,7 +273,7 @@ exit:
>> }
>>
>> int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev,
>> - u8 key_index)
>> + u8 key_index, bool unicast, bool multicast)
It seems can fix the warning .
Thanks
>> {
>> wlandevice_t *wlandev = dev->ml_priv;
>>
>> --
>> 1.7.0.4
>>
>>
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

2011-04-26 16:48:23

by Randy Dunlap

[permalink] [raw]
Subject: Re: [PATCH]Remove a warning

On Tue, 26 Apr 2011 12:38:37 +0800 Harry Wei wrote:

> Hi us,
> When i was compiling kernel, a warning happened to me.
> The warning said like following.
>
> drivers/staging/wlan-ng/cfg80211.c:709: warning: initialization from
> incompatible pointer type
>
> So i patched like this.
>
> From: Harry Wei <[email protected]>
>
> Signed-off-by: Harry Wei <[email protected]>

Acked-by: Randy Dunlap <[email protected]>

Thanks.


> ---
> drivers/staging/wlan-ng/cfg80211.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
> index 6a71f52..7637839 100644
> --- a/drivers/staging/wlan-ng/cfg80211.c
> +++ b/drivers/staging/wlan-ng/cfg80211.c
> @@ -273,7 +273,7 @@ exit:
> }
>
> int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev,
> - u8 key_index)
> + u8 key_index, bool unicast, bool multicast)
> {
> wlandevice_t *wlandev = dev->ml_priv;
>
> --


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***