* [PATCH] staging: fix a silly typo
@ 2009-11-30 13:24 Alan Cox
2009-11-30 16:09 ` Randy Dunlap
2009-11-30 16:14 ` Greg KH
0 siblings, 2 replies; 7+ messages in thread
From: Alan Cox @ 2009-11-30 13:24 UTC (permalink / raw)
To: greg, linux-kernel
(Resend #3)
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
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 <andreamrl@tiscali.it>");
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);
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] staging: fix a silly typo
2009-11-30 13:24 [PATCH] staging: fix a silly typo Alan Cox
@ 2009-11-30 16:09 ` Randy Dunlap
2009-11-30 16:14 ` Greg KH
1 sibling, 0 replies; 7+ messages in thread
From: Randy Dunlap @ 2009-11-30 16:09 UTC (permalink / raw)
To: Alan Cox; +Cc: greg, linux-kernel, Rusty Russell
Alan Cox wrote:
> (Resend #3)
> Signed-off-by: Alan Cox <alan@linux.intel.com>
> ---
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 <andreamrl@tiscali.it>");
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] staging: fix a silly typo
2009-11-30 13:24 [PATCH] staging: fix a silly typo Alan Cox
2009-11-30 16:09 ` Randy Dunlap
@ 2009-11-30 16:14 ` Greg KH
2009-11-30 16:39 ` Alan Cox
2009-12-01 1:58 ` Rusty Russell
1 sibling, 2 replies; 7+ messages in thread
From: Greg KH @ 2009-11-30 16:14 UTC (permalink / raw)
To: Alan Cox, Rusty Russell; +Cc: linux-kernel
On Mon, Nov 30, 2009 at 01:24:49PM +0000, Alan Cox wrote:
> (Resend #3)
>
> Signed-off-by: Alan Cox <alan@linux.intel.com>
> ---
>
> 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 <andreamrl@tiscali.it>");
> 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);
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] staging: fix a silly typo
2009-11-30 16:14 ` Greg KH
@ 2009-11-30 16:39 ` Alan Cox
2009-11-30 16:59 ` Greg KH
2009-12-01 1:58 ` Rusty Russell
1 sibling, 1 reply; 7+ messages in thread
From: Alan Cox @ 2009-11-30 16:39 UTC (permalink / raw)
To: Greg KH; +Cc: Alan Cox, Rusty Russell, linux-kernel
On Mon, 30 Nov 2009 08:14:05 -0800
Greg KH <greg@kroah.com> wrote:
> On Mon, Nov 30, 2009 at 01:24:49PM +0000, Alan Cox wrote:
> > (Resend #3)
> >
> > Signed-off-by: Alan Cox <alan@linux.intel.com>
> > ---
> >
> > 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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] staging: fix a silly typo
2009-11-30 16:39 ` Alan Cox
@ 2009-11-30 16:59 ` Greg KH
2009-12-01 2:07 ` Rusty Russell
0 siblings, 1 reply; 7+ messages in thread
From: Greg KH @ 2009-11-30 16:59 UTC (permalink / raw)
To: Alan Cox; +Cc: Alan Cox, Rusty Russell, linux-kernel
On Mon, Nov 30, 2009 at 04:39:37PM +0000, Alan Cox wrote:
> On Mon, 30 Nov 2009 08:14:05 -0800
> Greg KH <greg@kroah.com> wrote:
>
> > On Mon, Nov 30, 2009 at 01:24:49PM +0000, Alan Cox wrote:
> > > (Resend #3)
> > >
> > > Signed-off-by: Alan Cox <alan@linux.intel.com>
> > > ---
> > >
> > > 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] staging: fix a silly typo
2009-11-30 16:59 ` Greg KH
@ 2009-12-01 2:07 ` Rusty Russell
0 siblings, 0 replies; 7+ messages in thread
From: Rusty Russell @ 2009-12-01 2:07 UTC (permalink / raw)
To: Greg KH; +Cc: Alan Cox, Alan Cox, linux-kernel, Stephen Rothwell
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 <alan@linux.intel.com>
Subject: [PATCH] staging: fix a silly typo
(Resend #3)
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
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 <andreamrl@tiscali.it>");
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);
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] staging: fix a silly typo
2009-11-30 16:14 ` Greg KH
2009-11-30 16:39 ` Alan Cox
@ 2009-12-01 1:58 ` Rusty Russell
1 sibling, 0 replies; 7+ messages in thread
From: Rusty Russell @ 2009-12-01 1:58 UTC (permalink / raw)
To: Greg KH; +Cc: Alan Cox, linux-kernel, Stephen Rothwell
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 <alan@linux.intel.com>
> > ---
> >
> > 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.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-12-01 2:07 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-30 13:24 [PATCH] staging: fix a silly typo Alan Cox
2009-11-30 16:09 ` Randy Dunlap
2009-11-30 16:14 ` Greg KH
2009-11-30 16:39 ` Alan Cox
2009-11-30 16:59 ` Greg KH
2009-12-01 2:07 ` Rusty Russell
2009-12-01 1:58 ` Rusty Russell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox