Skip to contentSkip to conversation

staging: fix a silly typo

PATCH In review Alan Cox 5 participants 7 messages Nov 30, 2009 – Dec 1, 2009 Staging

lore
Share & tools
lore

Alan Cox

author
#0 lore raw

PATCH 1/1 staging: fix a silly typo

(Resend #3)

---

 drivers/staging/rtl8187se/r8180_core.c  |    2 +-
 drivers/staging/rtl8192su/r8192U_core.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8187se/r8180_core.c +1 -1
index 5a6cd60..d74bf70 100644
@@ -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);
drivers/staging/rtl8192su/r8192U_core.c +1 -1
index e24815f..0a052ea 100644
@@ -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);
#1 lore raw
Quoted 4 lines · Alan Cox

(Resend #3)

---

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?

Quoted 31 lines
 drivers/staging/rtl8187se/r8180_core.c  |    2 +-
 drivers/staging/rtl8192su/r8192U_core.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8187se/r8180_core.c +1 -1
index 5a6cd60..d74bf70 100644
@@ -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);
drivers/staging/rtl8192su/r8192U_core.c +1 -1
index e24815f..0a052ea 100644
@@ -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);
Signature · 1 line
~Randy
#2 lore raw
In reply to Alan Cox
Quoted 8 lines · Alan Cox

(Resend #3)

---

 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

Quoted 26 lines
drivers/staging/rtl8187se/r8180_core.c +1 -1
index 5a6cd60..d74bf70 100644
@@ -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);
drivers/staging/rtl8192su/r8192U_core.c +1 -1
index e24815f..0a052ea 100644
@@ -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);
#3 lore raw
Quoted 6 lines · On Mon, 30 Nov 2009 08:14:05 -0800 Greg KH <[email protected]> wrote:
Quoted 5 lines · Alan Cox

(Resend #3)

---

Quoted 6 lines
Quoted 3 lines
 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.

#4 lore raw
Quoted 13 lines · Alan Cox
Quoted 10 lines · On Mon, 30 Nov 2009 08:14:05 -0800 Greg KH <[email protected]> wrote:
Quoted 8 lines · Alan Cox

(Resend #3)

---

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

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

#5 lore raw
Quoted 9 lines · Greg KH
Quoted 2 lines · Alan Cox

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)

---

 drivers/staging/rtl8187se/r8180_core.c  |    2 +-
 drivers/staging/rtl8192su/r8192U_core.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8187se/r8180_core.c +1 -1
index 5a6cd60..d74bf70 100644
@@ -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);
drivers/staging/rtl8192su/r8192U_core.c +1 -1
index e24815f..0a052ea 100644
@@ -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);
#6 lore raw
In reply to Greg KH
Quoted 6 lines · Greg KH
Quoted 5 lines · Alan Cox

(Resend #3)

---

Quoted 8 lines
Quoted 3 lines
 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.