2009-11-30 13:44:16

by Alan

Subject: [PATCH] staging: fix a silly typo

(Resend #3)

Signed-off-by: Alan Cox <[email protected]>
---

drivers/staging/rtl8187se/r8180_core.c | 2 +-
drivers/staging/rtl8192su/r8192U_core.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 5a6cd60..d74bf70 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -79,7 +79,7 @@ MODULE_AUTHOR("Andrea Merello <[email protected]>");
MODULE_DESCRIPTION("Linux driver for Realtek RTL8180 / RTL8185 WiFi cards");


-module_param_string(ifname, ifname, sizef(ifname), S_IRUGO|S_IWUSR);
+module_param_string(ifname, ifname, sizeof(ifname), S_IRUGO|S_IWUSR);
module_param(hwseqnum,int, S_IRUGO|S_IWUSR);
module_param(hwwep,int, S_IRUGO|S_IWUSR);
module_param(channels,int, S_IRUGO|S_IWUSR);
diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c
index e24815f..0a052ea 100644
--- a/drivers/staging/rtl8192su/r8192U_core.c
+++ b/drivers/staging/rtl8192su/r8192U_core.c
@@ -142,7 +142,7 @@ static int channels = 0x3fff;



-module_param_string(ifname, ifname, sizef(ifname), S_IRUGO|S_IWUSR);
+module_param_string(ifname, ifname, sizeof(ifname), S_IRUGO|S_IWUSR);
//module_param(hwseqnum,int, S_IRUGO|S_IWUSR);
module_param(hwwep,int, S_IRUGO|S_IWUSR);
module_param(channels,int, S_IRUGO|S_IWUSR);

2009-11-30 16:09:46

by Randy Dunlap

Subject: Re: [PATCH] staging: fix a silly typo

Alan Cox wrote:
> (Resend #3)

> Signed-off-by: Alan Cox <[email protected]>
> ---
I have also sent this patch a few times.

The problems are in Rusty Russell's quilt series/tree and he replied to me
that he fixed them, but they don't seem to be pushed yet....

Rusty?


> drivers/staging/rtl8187se/r8180_core.c | 2 +-
> drivers/staging/rtl8192su/r8192U_core.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>
> diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
> index 5a6cd60..d74bf70 100644
> --- a/drivers/staging/rtl8187se/r8180_core.c
> +++ b/drivers/staging/rtl8187se/r8180_core.c
> @@ -79,7 +79,7 @@ MODULE_AUTHOR("Andrea Merello <[email protected]>");
> MODULE_DESCRIPTION("Linux driver for Realtek RTL8180 / RTL8185 WiFi cards");
>
>
> -module_param_string(ifname, ifname, sizef(ifname), S_IRUGO|S_IWUSR);
> +module_param_string(ifname, ifname, sizeof(ifname), S_IRUGO|S_IWUSR);
> module_param(hwseqnum,int, S_IRUGO|S_IWUSR);
> module_param(hwwep,int, S_IRUGO|S_IWUSR);
> module_param(channels,int, S_IRUGO|S_IWUSR);
> diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c
> index e24815f..0a052ea 100644
> --- a/drivers/staging/rtl8192su/r8192U_core.c
> +++ b/drivers/staging/rtl8192su/r8192U_core.c
> @@ -142,7 +142,7 @@ static int channels = 0x3fff;
>
>
>
> -module_param_string(ifname, ifname, sizef(ifname), S_IRUGO|S_IWUSR);
> +module_param_string(ifname, ifname, sizeof(ifname), S_IRUGO|S_IWUSR);
> //module_param(hwseqnum,int, S_IRUGO|S_IWUSR);
> module_param(hwwep,int, S_IRUGO|S_IWUSR);
> module_param(channels,int, S_IRUGO|S_IWUSR);


--
~Randy

2009-11-30 16:14:25

by Greg KH

Subject: Re: [PATCH] staging: fix a silly typo

On Mon, Nov 30, 2009 at 01:24:49PM +0000, Alan Cox wrote:
> (Resend #3)
>
> Signed-off-by: Alan Cox <[email protected]>
> ---
>
> drivers/staging/rtl8187se/r8180_core.c | 2 +-
> drivers/staging/rtl8192su/r8192U_core.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)

This is due to changes in Rusty's tree, not mine. You aren't the only
one constantly sending this patch, Randy is as well.

Rusty, I thought you fixed these up?

thanks,

greg k-h

> diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
> index 5a6cd60..d74bf70 100644
> --- a/drivers/staging/rtl8187se/r8180_core.c
> +++ b/drivers/staging/rtl8187se/r8180_core.c
> @@ -79,7 +79,7 @@ MODULE_AUTHOR("Andrea Merello <[email protected]>");
> MODULE_DESCRIPTION("Linux driver for Realtek RTL8180 / RTL8185 WiFi cards");
>
>
> -module_param_string(ifname, ifname, sizef(ifname), S_IRUGO|S_IWUSR);
> +module_param_string(ifname, ifname, sizeof(ifname), S_IRUGO|S_IWUSR);
> module_param(hwseqnum,int, S_IRUGO|S_IWUSR);
> module_param(hwwep,int, S_IRUGO|S_IWUSR);
> module_param(channels,int, S_IRUGO|S_IWUSR);
> diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c
> index e24815f..0a052ea 100644
> --- a/drivers/staging/rtl8192su/r8192U_core.c
> +++ b/drivers/staging/rtl8192su/r8192U_core.c
> @@ -142,7 +142,7 @@ static int channels = 0x3fff;
>
>
>
> -module_param_string(ifname, ifname, sizef(ifname), S_IRUGO|S_IWUSR);
> +module_param_string(ifname, ifname, sizeof(ifname), S_IRUGO|S_IWUSR);
> //module_param(hwseqnum,int, S_IRUGO|S_IWUSR);
> module_param(hwwep,int, S_IRUGO|S_IWUSR);
> module_param(channels,int, S_IRUGO|S_IWUSR);

2009-11-30 16:37:43

by Alan

Subject: Re: [PATCH] staging: fix a silly typo

On Mon, 30 Nov 2009 08:14:05 -0800
Greg KH <[email protected]> wrote:

> On Mon, Nov 30, 2009 at 01:24:49PM +0000, Alan Cox wrote:
> > (Resend #3)
> >
> > Signed-off-by: Alan Cox <[email protected]>
> > ---
> >
> > drivers/staging/rtl8187se/r8180_core.c | 2 +-
> > drivers/staging/rtl8192su/r8192U_core.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
>
> This is due to changes in Rusty's tree, not mine. You aren't the only
> one constantly sending this patch, Randy is as well.

Well given Rusty has vanished can you apply it to staging and rusty can
fix his tree up when he returns, assuming patch doesn't fix it for him.

2009-11-30 16:59:31

by Greg KH

Subject: Re: [PATCH] staging: fix a silly typo

On Mon, Nov 30, 2009 at 04:39:37PM +0000, Alan Cox wrote:
> On Mon, 30 Nov 2009 08:14:05 -0800
> Greg KH <[email protected]> wrote:
>
> > On Mon, Nov 30, 2009 at 01:24:49PM +0000, Alan Cox wrote:
> > > (Resend #3)
> > >
> > > Signed-off-by: Alan Cox <[email protected]>
> > > ---
> > >
> > > drivers/staging/rtl8187se/r8180_core.c | 2 +-
> > > drivers/staging/rtl8192su/r8192U_core.c | 2 +-
> > > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > This is due to changes in Rusty's tree, not mine. You aren't the only
> > one constantly sending this patch, Randy is as well.
>
> Well given Rusty has vanished can you apply it to staging and rusty can
> fix his tree up when he returns, assuming patch doesn't fix it for him.

The patch does not apply to my tree at all, the problem is caused by
stuff done only in Rusty's tree. He has changed the code here to be
broken, not me, so there's really nothing I can do about it.

Stephen could apply it to linux-next though.

thanks,

greg k-h

2009-12-01 01:58:12

by Rusty Russell

Subject: Re: [PATCH] staging: fix a silly typo

On Tue, 1 Dec 2009 02:44:05 am Greg KH wrote:
> On Mon, Nov 30, 2009 at 01:24:49PM +0000, Alan Cox wrote:
> > (Resend #3)
> >
> > Signed-off-by: Alan Cox <[email protected]>
> > ---
> >
> > drivers/staging/rtl8187se/r8180_core.c | 2 +-
> > drivers/staging/rtl8192su/r8192U_core.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
>
> This is due to changes in Rusty's tree, not mine. You aren't the only
> one constantly sending this patch, Randy is as well.
>
> Rusty, I thought you fixed these up?

I did too, but it seems not. Which is very weird; I don't send replies
until I've actually done something.

Fixed and uploaded.

Sorry,
Rusty.

2009-12-01 02:07:27

by Rusty Russell

Subject: Re: [PATCH] staging: fix a silly typo

On Tue, 1 Dec 2009 03:29:18 am Greg KH wrote:
> On Mon, Nov 30, 2009 at 04:39:37PM +0000, Alan Cox wrote:
> > Well given Rusty has vanished can you apply it to staging and rusty can
> > fix his tree up when he returns, assuming patch doesn't fix it for him.
>
> The patch does not apply to my tree at all, the problem is caused by
> stuff done only in Rusty's tree. He has changed the code here to be
> broken, not me, so there's really nothing I can do about it.
>
> Stephen could apply it to linux-next though.

I missed linux-next for today, but sfr offered to apply it manually:

From: Alan Cox <[email protected]>
Subject: [PATCH] staging: fix a silly typo

(Resend #3)

Signed-off-by: Alan Cox <[email protected]>
---

drivers/staging/rtl8187se/r8180_core.c | 2 +-
drivers/staging/rtl8192su/r8192U_core.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 5a6cd60..d74bf70 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -79,7 +79,7 @@ MODULE_AUTHOR("Andrea Merello <[email protected]>");
MODULE_DESCRIPTION("Linux driver for Realtek RTL8180 / RTL8185 WiFi cards");


-module_param_string(ifname, ifname, sizef(ifname), S_IRUGO|S_IWUSR);
+module_param_string(ifname, ifname, sizeof(ifname), S_IRUGO|S_IWUSR);
module_param(hwseqnum,int, S_IRUGO|S_IWUSR);
module_param(hwwep,int, S_IRUGO|S_IWUSR);
module_param(channels,int, S_IRUGO|S_IWUSR);
diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c
index e24815f..0a052ea 100644
--- a/drivers/staging/rtl8192su/r8192U_core.c
+++ b/drivers/staging/rtl8192su/r8192U_core.c
@@ -142,7 +142,7 @@ static int channels = 0x3fff;



-module_param_string(ifname, ifname, sizef(ifname), S_IRUGO|S_IWUSR);
+module_param_string(ifname, ifname, sizeof(ifname), S_IRUGO|S_IWUSR);
//module_param(hwseqnum,int, S_IRUGO|S_IWUSR);
module_param(hwwep,int, S_IRUGO|S_IWUSR);
module_param(channels,int, S_IRUGO|S_IWUSR);