* linux-next: manual merge of the staging-next tree with the rr tree
@ 2010-05-10 5:15 Stephen Rothwell
2010-05-10 16:41 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2010-05-10 5:15 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Rusty Russell, John Church, Larry Finger
Hi Greg,
Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/rtl8187se/r8180_core.c between commit
db8b06bcf94dbd02fba2601bee81ac4d9a626095
("param:remove-useless-writable-charp") from the rr tree and commit
3992db8fcb2ead240f311fc3e212443c5e1c43b9 ("Staging: rtl8187se: fix coding
style issues in r8180_core.c") from the staging-next tree.
I fixed it up (see below) and can carry the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/rtl8187se/r8180_core.c
index b09ce4b,84a745b..0000000
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@@ -3612,10 -3614,10 +3614,10 @@@ static int __devinit rtl8180_pci_probe(
dev->watchdog_timeo = HZ*3;
if (dev_alloc_name(dev, ifname) < 0){
- DMESG("Oops: devname already taken! Trying wlan%%d...\n");
+ DMESG("Oops: devname already taken! Trying wlan%%d...\n");
- ifname = "wlan%d";
+ strcpy(ifname, "wlan%d");
dev_alloc_name(dev, ifname);
- }
+ }
if(rtl8180_init(dev)!=0){
DMESG("Initialization failed");
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the staging-next tree with the rr tree
2010-05-10 5:15 linux-next: manual merge of the staging-next tree with the rr tree Stephen Rothwell
@ 2010-05-10 16:41 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2010-05-10 16:41 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Rusty Russell, John Church, Larry Finger
On Mon, May 10, 2010 at 03:15:37PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/rtl8187se/r8180_core.c between commit
> db8b06bcf94dbd02fba2601bee81ac4d9a626095
> ("param:remove-useless-writable-charp") from the rr tree and commit
> 3992db8fcb2ead240f311fc3e212443c5e1c43b9 ("Staging: rtl8187se: fix coding
> style issues in r8180_core.c") from the staging-next tree.
>
> I fixed it up (see below) and can carry the fixes as necessary.
Thanks, the fix looks great.
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the staging-next tree with the rr tree
2010-05-17 5:44 Stephen Rothwell
@ 2010-05-17 18:01 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2010-05-17 18:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Prashant P. Shah, Rusty Russell
On Mon, May 17, 2010 at 03:44:52PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/rtl8187se/r8180_core.c between commit
> 9080984577cb3e04226d94c8f733534b60541f01
> ("param:remove-useless-writable-charp") from the rr tree and commit
> bbfb56520c8da666383c08220985495ff918d4ad ("") from the staging-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good, thanks.
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the staging-next tree with the rr tree
@ 2010-05-17 5:44 Stephen Rothwell
2010-05-17 18:01 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2010-05-17 5:44 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Prashant P. Shah, Rusty Russell
Hi Greg,
Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/rtl8187se/r8180_core.c between commit
9080984577cb3e04226d94c8f733534b60541f01
("param:remove-useless-writable-charp") from the rr tree and commit
bbfb56520c8da666383c08220985495ff918d4ad ("") from the staging-next tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/rtl8187se/r8180_core.c
index b09ce4b,dacefea..0000000
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@@ -74,15 -74,15 +74,15 @@@ MODULE_AUTHOR("Andrea Merello <andreamr
MODULE_DESCRIPTION("Linux driver for Realtek RTL8180 / RTL8185 WiFi cards");
-module_param(ifname, charp, 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);
+ module_param(hwseqnum, int, S_IRUGO|S_IWUSR);
+ module_param(hwwep, int, S_IRUGO|S_IWUSR);
+ module_param(channels, int, S_IRUGO|S_IWUSR);
- MODULE_PARM_DESC(devname," Net interface name, wlan%d=default");
- MODULE_PARM_DESC(hwseqnum," Try to use hardware 802.11 header sequence numbers. Zero=default");
- MODULE_PARM_DESC(hwwep," Try to use hardware WEP support. Still broken and not available on all cards");
- MODULE_PARM_DESC(channels," Channel bitmask for specific locales. NYI");
+ MODULE_PARM_DESC(devname, " Net interface name, wlan%d=default");
+ MODULE_PARM_DESC(hwseqnum, " Try to use hardware 802.11 header sequence numbers. Zero=default");
+ MODULE_PARM_DESC(hwwep, " Try to use hardware WEP support. Still broken and not available on all cards");
+ MODULE_PARM_DESC(channels, " Channel bitmask for specific locales. NYI");
static int __devinit rtl8180_pci_probe(struct pci_dev *pdev,
@@@ -3608,16 -3606,16 +3606,16 @@@ static int __devinit rtl8180_pci_probe(
dev->netdev_ops = &rtl8180_netdev_ops;
dev->wireless_handlers = &r8180_wx_handlers_def;
- dev->type=ARPHRD_ETHER;
+ dev->type = ARPHRD_ETHER;
dev->watchdog_timeo = HZ*3;
- if (dev_alloc_name(dev, ifname) < 0){
- DMESG("Oops: devname already taken! Trying wlan%%d...\n");
+ if (dev_alloc_name(dev, ifname) < 0) {
+ DMESG("Oops: devname already taken! Trying wlan%%d...\n");
- ifname = "wlan%d";
+ strcpy(ifname, "wlan%d");
dev_alloc_name(dev, ifname);
- }
+ }
- if(rtl8180_init(dev)!=0){
+ if (rtl8180_init(dev) != 0) {
DMESG("Initialization failed");
goto fail1;
}
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-05-17 18:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-05-10 5:15 linux-next: manual merge of the staging-next tree with the rr tree Stephen Rothwell
2010-05-10 16:41 ` Greg KH
2010-05-17 5:44 Stephen Rothwell
2010-05-17 18:01 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).