* Re: [PATCH 5/7] pci: Export the pci_restore_msi_state() function
From: David Miller @ 2007-10-20 0:27 UTC (permalink / raw)
To: linas; +Cc: mchan, mcarlson, netdev, linux-pci
In-Reply-To: <20071020000421.GO29903@austin.ibm.com>
From: linas@austin.ibm.com (Linas Vepstas)
Date: Fri, 19 Oct 2007 19:04:21 -0500
> I'm working in linux-2.6.23-rc8-mm1 at the moment, and I don't see
> that happening. viz. read_msi_msg() is not called anywhere, and I need
> to have valid msg->address_lo and msg->address_hi and msg->data
> in order to be able to restore.
The generic PCI layer will save away the PCI config space elements
during pci_enable_msi(), including the MSI address and data values.
You can fetch the values you need from there during restore if
you need them.
See the pci_restore_msi_state() call done from pci_restore_state()
in drivers/pci/pci.c, that pci_restore_msi_state() code in
drivers/pci/msi.c very much relies upon the entry->msg values
being uptodate and valid.
The MSI arch layer code is supposed to fill the entry->msg values in
via arch_setup_msi_irq(). Perhaps the pseries code is forgetting to
do that.
So I can't really see what the problem is you're talking about.
^ permalink raw reply
* [BUG] powerpc does not save msi state [was Re: [PATCH 5/7] pci: Export the pci_restore_msi_state() function
From: Linas Vepstas @ 2007-10-20 0:46 UTC (permalink / raw)
To: David Miller, linuxppc-dev
Cc: mchan, mcarlson, netdev, linux-pci, Michael Ellerman
In-Reply-To: <20071019.172706.57467960.davem@davemloft.net>
Hi,
On Fri, Oct 19, 2007 at 05:27:06PM -0700, David Miller wrote:
> From: linas@austin.ibm.com (Linas Vepstas)
> Date: Fri, 19 Oct 2007 19:04:21 -0500
>
> > I'm working in linux-2.6.23-rc8-mm1 at the moment, and I don't see
> > that happening. viz. read_msi_msg() is not called anywhere, and I need
> > to have valid msg->address_lo and msg->address_hi and msg->data
> > in order to be able to restore.
>
> See the pci_restore_msi_state() call done from pci_restore_state()
> in drivers/pci/pci.c, that pci_restore_msi_state() code in
> drivers/pci/msi.c very much relies upon the entry->msg values
> being uptodate and valid.
>
> The MSI arch layer code is supposed to fill the entry->msg values in
> via arch_setup_msi_irq(). Perhaps the pseries code is forgetting to
> do that.
Yep. Thank you for confirming the correct location for the fix.
FWIW, it looks like not all that many arches do this; the output
for grep -r address_hi * is pretty thin. Then, looking at
i386/kernel/io_apic.c as an example, one can see that the
msi state save happens "by accident" if CONFIG_SMP is enabled;
and so its surely broekn on uniprocesor machines.
I'm cc'ing the powerpc mailing list to point this out:
it looks like only cell/axon_msi.c and mpic_u3msi.c
bother do do anything. I guess that there aren't any old
macintosh laptops that have msi on them? Because without
this, suspend and resume breaks.
Paul,
On the off chance your reading this, I'll send a pseries
patch on Monday, with luck (and some other patches too).
I'm not touching any of the other plaforms, you and benh
would know those better.
--linas
^ permalink raw reply
* Re: [BUG] powerpc does not save msi state [was Re: [PATCH 5/7] pci: Export the pci_restore_msi_state() function
From: David Miller @ 2007-10-20 0:53 UTC (permalink / raw)
To: linas; +Cc: netdev, mcarlson, linuxppc-dev, mchan, linux-pci
In-Reply-To: <20071020004610.GR29903@austin.ibm.com>
From: linas@austin.ibm.com (Linas Vepstas)
Date: Fri, 19 Oct 2007 19:46:10 -0500
> FWIW, it looks like not all that many arches do this; the output
> for grep -r address_hi * is pretty thin. Then, looking at
> i386/kernel/io_apic.c as an example, one can see that the
> msi state save happens "by accident" if CONFIG_SMP is enabled;
> and so its surely broekn on uniprocesor machines.
I don't see this, in all cases write_msi_msg() will transfer
the given "*msg" to entry->msg by this assignment in
drivers/pci/msi.c:
void write_msi_msg(unsigned int irq, struct msi_msg *msg)
{
...
entry->msg = *msg;
}
So as long as write_msi_msg() is invoked, it will be saved
properly.
Platforms need not do this explicitly.
^ permalink raw reply
* Re: atm: panic when loading clip 2nd time
From: Randy Dunlap @ 2007-10-20 1:02 UTC (permalink / raw)
To: Nish Aravamudan; +Cc: linux-kernel, NetDev, chas
In-Reply-To: <29495f1d0710161433h6e4e90a6r32c89c2a89af2f90@mail.gmail.com>
On Tue, 16 Oct 2007 14:33:38 -0700 Nish Aravamudan wrote:
> On 10/16/07, Randy Dunlap <randy.dunlap@oracle.com> wrote:
> > 2.6.23-git7, using SLAB (not SLUB) [config attached]:
> >
> > # modprobe clip
> > # rmmod clip
> > # modprobe clip
> >
> > results in panic:
> >
> > kmem_cache_create: duplicate cache clip_arp_cache
> >
> > Call Trace:
> > [<ffffffff8028c682>] kmem_cache_create+0x3bf/0x3fd
> > [<ffffffff8046ba1d>] neigh_table_init_no_netlink+0x6c/0x242
> > [<ffffffff8800a010>] :clip:atm_clip_init+0x10/0x8a
> > [<ffffffff80258ba4>] sys_init_module+0x146c/0x15cd
> > [<ffffffff8046be0a>] neigh_lookup+0x0/0xd5
> > [<ffffffff8020ef44>] syscall_trace_enter+0x95/0x99
> > [<ffffffff8020beec>] tracesys+0xdc/0xe1
> >
> > Kernel panic - not syncing: kmem_cache_create(): failed to create slab `clip_arp_cache'
>
> >From a quick read through the code, looks like
> net/core/neighbour.c:neigh_table_clear() needs a kmem_cache_destroy()?
>
> I only see three callers of neight_table_clear() and they all seem to
> be in exit routines, so that should be safe?
Hi Nish,
Maybe. I can't tell without knowing the code better.
[make that patch, test it; test patch is below]
Well, it survives light testing (boot/init and a tarball download),
but I don't know how safe it is.
---
From: Randy Dunlap <randy.dunlap@oracle.com>
net/atm/clip.c crashes the kernel if it (module) is loaded, removed,
and then loaded again. Its exit call to neigh_table_clear()
should destroy the cache after freeing it.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
net/core/neighbour.c | 3 +++
1 file changed, 3 insertions(+)
--- linux-2.6.23-git7.orig/net/core/neighbour.c
+++ linux-2.6.23-git7/net/core/neighbour.c
@@ -1436,6 +1436,9 @@ int neigh_table_clear(struct neigh_table
free_percpu(tbl->stats);
tbl->stats = NULL;
+ kmem_cache_destroy(tbl->kmem_cachep);
+ tbl->kmem_cachep = NULL;
+
return 0;
}
^ permalink raw reply
* Re: [BUG] powerpc does not save msi state [was Re: [PATCH 5/7] pci: Export the pci_restore_msi_state() function
From: Benjamin Herrenschmidt @ 2007-10-20 1:29 UTC (permalink / raw)
To: Linas Vepstas
Cc: David Miller, linuxppc-dev, netdev, linux-pci, mcarlson, mchan,
Michael Ellerman
In-Reply-To: <20071020004610.GR29903@austin.ibm.com>
> I'm cc'ing the powerpc mailing list to point this out:
> it looks like only cell/axon_msi.c and mpic_u3msi.c
> bother do do anything. I guess that there aren't any old
> macintosh laptops that have msi on them? Because without
> this, suspend and resume breaks.
The only macs that can do any form of MSIs are the G5s using
mpic_u3msi.c
> Paul,
> On the off chance your reading this, I'll send a pseries
> patch on Monday, with luck (and some other patches too).
> I'm not touching any of the other plaforms, you and benh
> would know those better.
Or rather Michael as he wrote the ppc MSI support. I'll check with him
Ben.
^ permalink raw reply
* [PATCH] Fix build break in tsi108.c
From: Olof Johansson @ 2007-10-20 2:04 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linuxppc-dev, joe
Fix build break:
drivers/net/tsi108_eth.c: In function 'tsi108_init_one':
drivers/net/tsi108_eth.c:1633: error: expected ')' before 'dev'
drivers/net/tsi108_eth.c:1633: warning: too few arguments for format
make[2]: *** [drivers/net/tsi108_eth.o] Error 1
Signed-off-by: Olof Johansson <olof@lixom.net>
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
index df10af7..35d15e8 100644
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/tsi108_eth.c
@@ -1629,7 +1629,7 @@ tsi108_init_one(struct platform_device *pdev)
goto register_fail;
}
- printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: %s\n"
+ printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: %s\n",
dev->name, print_mac(mac, dev->dev_addr));
#ifdef DEBUG
data->msg_enable = DEBUG;
^ permalink raw reply related
* Re: linux kernel networking code review request
From: Dmitry Torokhov @ 2007-10-20 2:15 UTC (permalink / raw)
To: Templin, Fred L; +Cc: netdev
In-Reply-To: <39C363776A4E8C4A94691D2BD9D1C9A1029EDB5F@XCH-NW-7V2.nw.nos.boeing.com>
On Friday 19 October 2007, Templin, Fred L wrote:
> Hello,
>
> I would like to get a review on some new Linux
> kernel networking code. The code is based on the
> 2.6.23 source tree and touches three files - two
> in ./net/ipv6 and one in ./include/net. What is
> the proper procedure for requesting a review?
>
Just don your flameproof pants and post the changes here ;)
--
Dmitry
^ permalink raw reply
* Re: [PATCH] phy/bitbang: missing MODULE_LICENSE
From: Jeff Garzik @ 2007-10-20 3:03 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Scott Wood, netdev, linuxppc-dev
In-Reply-To: <20071018122021.2acd128d.randy.dunlap@oracle.com>
Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Missing MODULE_LICENSE(), loading this module taints the kernel.
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
> drivers/net/phy/mdio-bitbang.c | 2 ++
> 1 file changed, 2 insertions(+)
applied this and the NAPI_Howto Kconfig patch
^ permalink raw reply
* Re: [PATCH] [Bug 9187] ir-functions.c:(.text+0xbce18): undefined reference to `input_event'
From: Jeff Garzik @ 2007-10-20 3:04 UTC (permalink / raw)
To: Randy Dunlap; +Cc: bugme-daemon, NetDev
In-Reply-To: <4718385E.7050105@oracle.com>
Randy Dunlap wrote:
> [bugme-daemon@bugzilla.kernel.org wrote:]
>
>
>
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Drivers that use lro functions should depend on INET, otherwise they
> may not link correctly. Let's not select INET. Select should be used
> only for library-like code, not to enable subsystems.
>
> ERROR: "lro_flush_all" [drivers/net/myri10ge/myri10ge.ko] undefined!
> ERROR: "lro_receive_frags" [drivers/net/myri10ge/myri10ge.ko] undefined!
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
applied
^ permalink raw reply
* Re: [patch 1/1] qeth: remove header_ops bug
From: Jeff Garzik @ 2007-10-20 3:04 UTC (permalink / raw)
To: Ursula Braun
Cc: netdev, linux-s390, mschwid2, apw, linux-kernel, kamalesh, kaber
In-Reply-To: <20071019220007.791059000@linux.vnet.ibm.com>
applied
^ permalink raw reply
* Re: [PATCH] Fix build break in tsi108.c
From: Jeff Garzik @ 2007-10-20 3:04 UTC (permalink / raw)
To: Olof Johansson; +Cc: netdev, linuxppc-dev, joe
In-Reply-To: <20071020020420.GA20073@lixom.net>
Olof Johansson wrote:
> Fix build break:
>
> drivers/net/tsi108_eth.c: In function 'tsi108_init_one':
> drivers/net/tsi108_eth.c:1633: error: expected ')' before 'dev'
> drivers/net/tsi108_eth.c:1633: warning: too few arguments for format
> make[2]: *** [drivers/net/tsi108_eth.o] Error 1
>
>
> Signed-off-by: Olof Johansson <olof@lixom.net>
>
> diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
> index df10af7..35d15e8 100644
> --- a/drivers/net/tsi108_eth.c
> +++ b/drivers/net/tsi108_eth.c
> @@ -1629,7 +1629,7 @@ tsi108_init_one(struct platform_device *pdev)
> goto register_fail;
> }
>
> - printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: %s\n"
> + printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: %s\n",
> dev->name, print_mac(mac, dev->dev_addr));
> #ifdef DEBUG
applied
^ permalink raw reply
* Re: Please pull 'fixes-jgarzik' branch of wireless-2.6
From: Jeff Garzik @ 2007-10-20 3:04 UTC (permalink / raw)
To: John W. Linville
Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <20071018220946.GH8510-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
pulled
^ permalink raw reply
* Re: [PATCH] zd1211rw: fix a double include
From: Jeff Garzik @ 2007-10-20 3:06 UTC (permalink / raw)
To: John W. Linville; +Cc: netdev, linux-wireless, Holger Schurig
In-Reply-To: <11927586853636-git-send-email-linville@tuxdriver.com>
John W. Linville wrote:
> From: Holger Schurig <hs4233@mail.mn-solutions.de>
>
> This patch removes all double includes of the same file. This
> makes scripts/checkincludes.pl happy.
>
> Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
> Jeff, I missed the zd1211rw hunk of the "double includes" patch. Could
> you apply this one manually?
this does not appear to be needed, after the pull
^ permalink raw reply
* [git patches] net driver fixes
From: Jeff Garzik @ 2007-10-20 3:08 UTC (permalink / raw)
To: Andrew Morton, Linus Torvalds; +Cc: netdev, LKML
Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-linus
to receive the following updates:
drivers/net/Kconfig | 41 ++++-----------------
drivers/net/dm9000.c | 6 ++--
drivers/net/phy/mdio-bitbang.c | 2 +
drivers/net/tsi108_eth.c | 2 +-
drivers/net/tulip/Kconfig | 14 +++----
drivers/net/wireless/b43/main.c | 5 +--
drivers/net/wireless/b43legacy/main.c | 2 +-
drivers/net/wireless/ipw2100.c | 39 ++++++++++++++++++++
drivers/net/wireless/ipw2100.h | 4 ++
drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 3 --
drivers/net/wireless/iwlwifi/iwl-3945.c | 1 -
drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 13 ++++---
drivers/net/wireless/iwlwifi/iwl-4965.c | 2 -
drivers/net/wireless/iwlwifi/iwl3945-base.c | 44 +++++++++++++---------
drivers/net/wireless/iwlwifi/iwl4965-base.c | 52 +++++++++++++++-----------
drivers/net/wireless/iwlwifi/iwlwifi.h | 7 +---
drivers/net/wireless/p54common.c | 2 +-
drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +-
drivers/net/wireless/rt2x00/rt73usb.c | 1 +
drivers/net/wireless/rtl8187_dev.c | 35 ++++++++----------
drivers/net/wireless/zd1201.c | 4 +-
drivers/net/wireless/zd1211rw/zd_usb.c | 7 +++-
drivers/s390/net/qeth_main.c | 3 +-
23 files changed, 158 insertions(+), 133 deletions(-)
Adrian Bunk (1):
iwl4965-base.c: fix off-by-one errors
Dan Williams (1):
ipw2100: send WEXT scan events
Holger Schurig (1):
janitorial: fix all double includes in drivers/net/wireless
Ivo van Doorn (1):
rt2x00: Add new rt73usb USB ID
John W. Linville (1):
zd1201: avoid null ptr access of skb->dev
Larry Finger (1):
b43legacy: Fix potential return of uninitialized variable
Marc Pignat (1):
zd1211rw, fix oops when ejecting install media
Mattias Nissler (1):
rt2x00: Fix residual check in PLCP calculations.
Michael Buesch (1):
b43: Make b43_stop() static
Michael Wu (3):
rtl8187: Fix more frag bit checking, rts duration calc
rtl8187: remove NICMAC setting in configure_filters callback
p54: Make filter configuration atomic
Mike Rapoport (1):
DM9000 initialization fix
Olof Johansson (1):
Fix build break in tsi108.c
Randy Dunlap (3):
phy/bitbang: missing MODULE_LICENSE
NAPI: kconfig prompt and deleted doc file
ir-functions.c:(.text+0xbce18): undefined reference to `input_event'
Ron Rindjunsky (1):
iwlwifi: set correct base rate for A band in rs_dbgfs_set_mcs
Tomas Winkler (1):
iwlwifi: Fix rate setting in probe request for HW sacn
Ursula Braun (1):
qeth: remove header_ops bug
WANG Cong (1):
drivers/net/wireless/b43/main.c: fix an uninitialized variable
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 83d52c8..2cafa5c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1293,9 +1293,6 @@ config PCNET32_NAPI
deployed on potentially unfriendly networks (e.g. in a firewall),
then say Y here.
- See <file:Documentation/networking/NAPI_HOWTO.txt> for more
- information.
-
If in doubt, say N.
config AMD8111_ETH
@@ -1313,7 +1310,7 @@ config AMD8111_ETH
will be called amd8111e.
config AMD8111E_NAPI
- bool "Enable NAPI support"
+ bool "Use RX polling (NAPI)"
depends on AMD8111_ETH
help
NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -1324,9 +1321,6 @@ config AMD8111E_NAPI
deployed on potentially unfriendly networks (e.g. in a firewall),
then say Y here.
- See <file:Documentation/networking/NAPI_HOWTO.txt> for more
- information.
-
If in doubt, say N.
config ADAPTEC_STARFIRE
@@ -1355,9 +1349,6 @@ config ADAPTEC_STARFIRE_NAPI
deployed on potentially unfriendly networks (e.g. in a firewall),
then say Y here.
- See <file:Documentation/networking/NAPI_HOWTO.txt> for more
- information.
-
If in doubt, say N.
config AC3200
@@ -1431,7 +1422,7 @@ config FORCEDETH
called forcedeth.
config FORCEDETH_NAPI
- bool "Use Rx and Tx Polling (NAPI) (EXPERIMENTAL)"
+ bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
depends on FORCEDETH && EXPERIMENTAL
help
NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -1442,9 +1433,6 @@ config FORCEDETH_NAPI
deployed on potentially unfriendly networks (e.g. in a firewall),
then say Y here.
- See <file:Documentation/networking/NAPI_HOWTO.txt> for more
- information.
-
If in doubt, say N.
config CS89x0
@@ -1756,9 +1744,6 @@ config VIA_RHINE_NAPI
deployed on potentially unfriendly networks (e.g. in a firewall),
then say Y here.
- See <file:Documentation/networking/NAPI_HOWTO.txt> for more
- information.
-
config LAN_SAA9730
bool "Philips SAA9730 Ethernet support"
depends on NET_PCI && PCI && MIPS_ATLAS
@@ -2003,9 +1988,6 @@ config E1000_NAPI
deployed on potentially unfriendly networks (e.g. in a firewall),
then say Y here.
- See <file:Documentation/networking/NAPI_HOWTO.txt> for more
- information.
-
If in doubt, say N.
config E1000_DISABLE_PACKET_SPLIT
@@ -2099,7 +2081,7 @@ config R8169
will be called r8169. This is recommended.
config R8169_NAPI
- bool "Use Rx and Tx Polling (NAPI) (EXPERIMENTAL)"
+ bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
depends on R8169 && EXPERIMENTAL
help
NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -2110,9 +2092,6 @@ config R8169_NAPI
deployed on potentially unfriendly networks (e.g. in a firewall),
then say Y here.
- See <file:Documentation/networking/NAPI_HOWTO.txt> for more
- information.
-
If in doubt, say N.
config R8169_VLAN
@@ -2364,7 +2343,7 @@ config GIANFAR
and MPC86xx family of chips, and the FEC on the 8540.
config GFAR_NAPI
- bool "NAPI Support"
+ bool "Use Rx Polling (NAPI)"
depends on GIANFAR
config UCC_GETH
@@ -2376,7 +2355,7 @@ config UCC_GETH
which is available on some Freescale SOCs.
config UGETH_NAPI
- bool "NAPI Support"
+ bool "Use Rx Polling (NAPI)"
depends on UCC_GETH
config UGETH_MAGIC_PACKET
@@ -2494,7 +2473,7 @@ config CHELSIO_T3
config EHEA
tristate "eHEA Ethernet support"
- depends on IBMEBUS
+ depends on IBMEBUS && INET
select INET_LRO
---help---
This driver supports the IBM pSeries eHEA ethernet adapter.
@@ -2559,9 +2538,6 @@ config IXGB_NAPI
deployed on potentially unfriendly networks (e.g. in a firewall),
then say Y here.
- See <file:Documentation/networking/NAPI_HOWTO.txt> for more
- information.
-
If in doubt, say N.
config S2IO
@@ -2584,14 +2560,11 @@ config S2IO_NAPI
deployed on potentially unfriendly networks (e.g. in a firewall),
then say Y here.
- See <file:Documentation/networking/NAPI_HOWTO.txt> for more
- information.
-
If in doubt, say N.
config MYRI10GE
tristate "Myricom Myri-10G Ethernet support"
- depends on PCI
+ depends on PCI && INET
select FW_LOADER
select CRC32
select INET_LRO
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 27ac010..3286d2a 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -542,7 +542,8 @@ dm9000_probe(struct platform_device *pdev)
if (id_val != DM9000_ID) {
printk("%s: wrong id: 0x%08x\n", CARDNAME, id_val);
- goto release;
+ ret = -ENODEV;
+ goto out;
}
/* from this point we assume that we have found a DM9000 */
@@ -602,8 +603,7 @@ dm9000_probe(struct platform_device *pdev)
}
return 0;
- release:
- out:
+out:
printk("%s: not found (%d).\n", CARDNAME, ret);
dm9000_release_board(pdev, db);
diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
index 8cd243d..2747b1f 100644
--- a/drivers/net/phy/mdio-bitbang.c
+++ b/drivers/net/phy/mdio-bitbang.c
@@ -185,3 +185,5 @@ void free_mdio_bitbang(struct mii_bus *bus)
module_put(ctrl->ops->owner);
kfree(bus);
}
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
index df10af7..35d15e8 100644
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/tsi108_eth.c
@@ -1629,7 +1629,7 @@ tsi108_init_one(struct platform_device *pdev)
goto register_fail;
}
- printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: %s\n"
+ printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: %s\n",
dev->name, print_mac(mac, dev->dev_addr));
#ifdef DEBUG
data->msg_enable = DEBUG;
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig
index 1c537d5..49d7a29 100644
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/tulip/Kconfig
@@ -67,7 +67,7 @@ config TULIP_MMIO
If in doubt, say N.
config TULIP_NAPI
- bool "Use NAPI RX polling "
+ bool "Use RX polling (NAPI)"
depends on TULIP
help
NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -78,18 +78,16 @@ config TULIP_NAPI
deployed on potentially unfriendly networks (e.g. in a firewall),
then say Y here.
- See <file:Documentation/networking/NAPI_HOWTO.txt> for more
- information.
-
If in doubt, say N.
config TULIP_NAPI_HW_MITIGATION
- bool "Use Interrupt Mitigation "
+ bool "Use Interrupt Mitigation"
depends on TULIP_NAPI
---help---
- Use HW to reduce RX interrupts. Not strict necessary since NAPI reduces
- RX interrupts but itself. Although this reduces RX interrupts even at
- low levels traffic at the cost of a small latency.
+ Use HW to reduce RX interrupts. Not strictly necessary since NAPI
+ reduces RX interrupts by itself. Interrupt mitigation reduces RX
+ interrupts even at low levels of traffic at the cost of a small
+ latency.
If in doubt, say Y.
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index c141a26..9d9ff76 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -49,7 +49,6 @@
#include "pio.h"
#include "sysfs.h"
#include "xmit.h"
-#include "sysfs.h"
#include "lo.h"
#include "pcmcia.h"
@@ -3495,7 +3494,7 @@ static int b43_start(struct ieee80211_hw *hw)
struct b43_wl *wl = hw_to_b43_wl(hw);
struct b43_wldev *dev = wl->current_dev;
int did_init = 0;
- int err;
+ int err = 0;
mutex_lock(&wl->mutex);
@@ -3521,7 +3520,7 @@ static int b43_start(struct ieee80211_hw *hw)
return err;
}
-void b43_stop(struct ieee80211_hw *hw)
+static void b43_stop(struct ieee80211_hw *hw)
{
struct b43_wl *wl = hw_to_b43_wl(hw);
struct b43_wldev *dev = wl->current_dev;
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index f074951..d09479e 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -3306,7 +3306,7 @@ static int b43legacy_start(struct ieee80211_hw *hw)
struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
struct b43legacy_wldev *dev = wl->current_dev;
int did_init = 0;
- int err;
+ int err = 0;
mutex_lock(&wl->mutex);
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 2d46a16..2fa8eed 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -2105,12 +2105,46 @@ static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status)
queue_delayed_work(priv->workqueue, &priv->rf_kill, round_jiffies(HZ));
}
+static void send_scan_event(void *data)
+{
+ struct ipw2100_priv *priv = data;
+ union iwreq_data wrqu;
+
+ wrqu.data.length = 0;
+ wrqu.data.flags = 0;
+ wireless_send_event(priv->net_dev, SIOCGIWSCAN, &wrqu, NULL);
+}
+
+static void ipw2100_scan_event_later(struct work_struct *work)
+{
+ send_scan_event(container_of(work, struct ipw2100_priv,
+ scan_event_later.work));
+}
+
+static void ipw2100_scan_event_now(struct work_struct *work)
+{
+ send_scan_event(container_of(work, struct ipw2100_priv,
+ scan_event_now));
+}
+
static void isr_scan_complete(struct ipw2100_priv *priv, u32 status)
{
IPW_DEBUG_SCAN("scan complete\n");
/* Age the scan results... */
priv->ieee->scans++;
priv->status &= ~STATUS_SCANNING;
+
+ /* Only userspace-requested scan completion events go out immediately */
+ if (!priv->user_requested_scan) {
+ if (!delayed_work_pending(&priv->scan_event_later))
+ queue_delayed_work(priv->workqueue,
+ &priv->scan_event_later,
+ round_jiffies(msecs_to_jiffies(4000)));
+ } else {
+ priv->user_requested_scan = 0;
+ cancel_delayed_work(&priv->scan_event_later);
+ queue_work(priv->workqueue, &priv->scan_event_now);
+ }
}
#ifdef CONFIG_IPW2100_DEBUG
@@ -4378,6 +4412,7 @@ static void ipw2100_kill_workqueue(struct ipw2100_priv *priv)
cancel_delayed_work(&priv->wx_event_work);
cancel_delayed_work(&priv->hang_check);
cancel_delayed_work(&priv->rf_kill);
+ cancel_delayed_work(&priv->scan_event_later);
destroy_workqueue(priv->workqueue);
priv->workqueue = NULL;
}
@@ -6121,6 +6156,8 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
INIT_DELAYED_WORK(&priv->wx_event_work, ipw2100_wx_event_work);
INIT_DELAYED_WORK(&priv->hang_check, ipw2100_hang_check);
INIT_DELAYED_WORK(&priv->rf_kill, ipw2100_rf_kill);
+ INIT_WORK(&priv->scan_event_now, ipw2100_scan_event_now);
+ INIT_DELAYED_WORK(&priv->scan_event_later, ipw2100_scan_event_later);
tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long))
ipw2100_irq_tasklet, (unsigned long)priv);
@@ -7425,6 +7462,8 @@ static int ipw2100_wx_set_scan(struct net_device *dev,
}
IPW_DEBUG_WX("Initiating scan...\n");
+
+ priv->user_requested_scan = 1;
if (ipw2100_set_scan_options(priv) || ipw2100_start_scan(priv)) {
IPW_DEBUG_WX("Start scan failed.\n");
diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h
index de7d384..1ee3348 100644
--- a/drivers/net/wireless/ipw2100.h
+++ b/drivers/net/wireless/ipw2100.h
@@ -588,6 +588,10 @@ struct ipw2100_priv {
struct delayed_work wx_event_work;
struct delayed_work hang_check;
struct delayed_work rf_kill;
+ struct work_struct scan_event_now;
+ struct delayed_work scan_event_later;
+
+ int user_requested_scan;
u32 interrupts;
int tx_interrupts;
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index f4aabcf..262ab0b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -37,9 +37,6 @@
#include <linux/workqueue.h>
-#include <net/mac80211.h>
-#include <linux/wireless.h>
-
#define IWL 3945
#include "../net/mac80211/ieee80211_rate.h"
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index acb3875..19bcb01 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -38,7 +38,6 @@
#include <net/mac80211.h>
#include <linux/etherdevice.h>
-#include <linux/delay.h>
#define IWL 3945
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index 287c757..8dc78c0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -36,9 +36,6 @@
#include <linux/workqueue.h>
-#include <net/mac80211.h>
-#include <linux/wireless.h>
-
#define IWL 4965
#include "../net/mac80211/ieee80211_rate.h"
@@ -2024,12 +2021,18 @@ static int open_file_generic(struct inode *inode, struct file *file)
static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv,
struct iwl_rate *mcs, int index)
{
- const u32 cck_rate = 0x820A;
+ u32 base_rate;
+
+ if (rs_priv->phymode == (u8) MODE_IEEE80211A)
+ base_rate = 0x800D;
+ else
+ base_rate = 0x820A;
+
if (rs_priv->dbg_fixed.rate_n_flags) {
if (index < 12)
mcs->rate_n_flags = rs_priv->dbg_fixed.rate_n_flags;
else
- mcs->rate_n_flags = cck_rate;
+ mcs->rate_n_flags = base_rate;
IWL_DEBUG_RATE("Fixed rate ON\n");
return;
}
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index b50d202..557deeb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -35,9 +35,7 @@
#include <linux/netdevice.h>
#include <linux/wireless.h>
#include <net/mac80211.h>
-#include <linux/netdevice.h>
#include <linux/etherdevice.h>
-#include <linux/delay.h>
#define IWL 4965
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 75e3b5c..83019d1 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -48,8 +48,6 @@
#include <linux/netdevice.h>
#include <linux/wireless.h>
#include <linux/firmware.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/if_arp.h>
@@ -1749,21 +1747,22 @@ static void iwl_unset_hw_setting(struct iwl_priv *priv)
* return : set the bit for each supported rate insert in ie
*/
static u16 iwl_supported_rate_to_ie(u8 *ie, u16 supported_rate,
- u16 basic_rate, int max_count)
+ u16 basic_rate, int *left)
{
u16 ret_rates = 0, bit;
int i;
- u8 *rates;
-
- rates = &(ie[1]);
+ u8 *cnt = ie;
+ u8 *rates = ie + 1;
for (bit = 1, i = 0; i < IWL_RATE_COUNT; i++, bit <<= 1) {
if (bit & supported_rate) {
ret_rates |= bit;
- rates[*ie] = iwl_rates[i].ieee |
- ((bit & basic_rate) ? 0x80 : 0x00);
- *ie = *ie + 1;
- if (*ie >= max_count)
+ rates[*cnt] = iwl_rates[i].ieee |
+ ((bit & basic_rate) ? 0x80 : 0x00);
+ (*cnt)++;
+ (*left)--;
+ if ((*left <= 0) ||
+ (*cnt >= IWL_SUPPORTED_RATES_IE_LEN))
break;
}
}
@@ -1780,7 +1779,7 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
{
int len = 0;
u8 *pos = NULL;
- u16 ret_rates;
+ u16 active_rates, ret_rates, cck_rates;
/* Make sure there is enough space for the probe request,
* two mandatory IEs and the data */
@@ -1825,19 +1824,27 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
left -= 2;
if (left < 0)
return 0;
+
/* ... fill it in... */
*pos++ = WLAN_EID_SUPP_RATES;
*pos = 0;
- ret_rates = priv->active_rate = priv->rates_mask;
+
+ priv->active_rate = priv->rates_mask;
+ active_rates = priv->active_rate;
priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK;
- iwl_supported_rate_to_ie(pos, priv->active_rate,
- priv->active_rate_basic, left);
+ cck_rates = IWL_CCK_RATES_MASK & active_rates;
+ ret_rates = iwl_supported_rate_to_ie(pos, cck_rates,
+ priv->active_rate_basic, &left);
+ active_rates &= ~ret_rates;
+
+ ret_rates = iwl_supported_rate_to_ie(pos, active_rates,
+ priv->active_rate_basic, &left);
+ active_rates &= ~ret_rates;
+
len += 2 + *pos;
pos += (*pos) + 1;
- ret_rates = ~ret_rates & priv->active_rate;
-
- if (ret_rates == 0)
+ if (active_rates == 0)
goto fill_end;
/* fill in supported extended rate */
@@ -1848,7 +1855,8 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
/* ... fill it in... */
*pos++ = WLAN_EID_EXT_SUPP_RATES;
*pos = 0;
- iwl_supported_rate_to_ie(pos, ret_rates, priv->active_rate_basic, left);
+ iwl_supported_rate_to_ie(pos, active_rates,
+ priv->active_rate_basic, &left);
if (*pos > 0)
len += 2 + *pos;
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index b1a6e39..5e12792 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -48,8 +48,6 @@
#include <linux/netdevice.h>
#include <linux/wireless.h>
#include <linux/firmware.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/if_arp.h>
@@ -1802,21 +1800,22 @@ static void iwl_unset_hw_setting(struct iwl_priv *priv)
* return : set the bit for each supported rate insert in ie
*/
static u16 iwl_supported_rate_to_ie(u8 *ie, u16 supported_rate,
- u16 basic_rate, int max_count)
+ u16 basic_rate, int *left)
{
u16 ret_rates = 0, bit;
int i;
- u8 *rates;
-
- rates = &(ie[1]);
+ u8 *cnt = ie;
+ u8 *rates = ie + 1;
for (bit = 1, i = 0; i < IWL_RATE_COUNT; i++, bit <<= 1) {
if (bit & supported_rate) {
ret_rates |= bit;
- rates[*ie] = iwl_rates[i].ieee |
- ((bit & basic_rate) ? 0x80 : 0x00);
- *ie = *ie + 1;
- if (*ie >= max_count)
+ rates[*cnt] = iwl_rates[i].ieee |
+ ((bit & basic_rate) ? 0x80 : 0x00);
+ (*cnt)++;
+ (*left)--;
+ if ((*left <= 0) ||
+ (*cnt >= IWL_SUPPORTED_RATES_IE_LEN))
break;
}
}
@@ -1839,7 +1838,7 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
{
int len = 0;
u8 *pos = NULL;
- u16 ret_rates;
+ u16 active_rates, ret_rates, cck_rates;
/* Make sure there is enough space for the probe request,
* two mandatory IEs and the data */
@@ -1884,19 +1883,27 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
left -= 2;
if (left < 0)
return 0;
+
/* ... fill it in... */
*pos++ = WLAN_EID_SUPP_RATES;
*pos = 0;
- ret_rates = priv->active_rate = priv->rates_mask;
+
+ priv->active_rate = priv->rates_mask;
+ active_rates = priv->active_rate;
priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK;
- iwl_supported_rate_to_ie(pos, priv->active_rate,
- priv->active_rate_basic, left);
+ cck_rates = IWL_CCK_RATES_MASK & active_rates;
+ ret_rates = iwl_supported_rate_to_ie(pos, cck_rates,
+ priv->active_rate_basic, &left);
+ active_rates &= ~ret_rates;
+
+ ret_rates = iwl_supported_rate_to_ie(pos, active_rates,
+ priv->active_rate_basic, &left);
+ active_rates &= ~ret_rates;
+
len += 2 + *pos;
pos += (*pos) + 1;
- ret_rates = ~ret_rates & priv->active_rate;
-
- if (ret_rates == 0)
+ if (active_rates == 0)
goto fill_end;
/* fill in supported extended rate */
@@ -1907,7 +1914,8 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
/* ... fill it in... */
*pos++ = WLAN_EID_EXT_SUPP_RATES;
*pos = 0;
- iwl_supported_rate_to_ie(pos, ret_rates, priv->active_rate_basic, left);
+ iwl_supported_rate_to_ie(pos, active_rates,
+ priv->active_rate_basic, &left);
if (*pos > 0)
len += 2 + *pos;
@@ -4494,13 +4502,13 @@ static u8 ratio2dB[100] = {
* Conversion assumes that levels are voltages (20*log), not powers (10*log). */
int iwl_calc_db_from_ratio(int sig_ratio)
{
- /* Anything above 1000:1 just report as 60 dB */
- if (sig_ratio > 1000)
+ /* 1000:1 or higher just report as 60 dB */
+ if (sig_ratio >= 1000)
return 60;
- /* Above 100:1, divide by 10 and use table,
+ /* 100:1 or higher, divide by 10 and use table,
* add 20 dB to make up for divide by 10 */
- if (sig_ratio > 100)
+ if (sig_ratio >= 100)
return (20 + (int)ratio2dB[sig_ratio/10]);
/* We shouldn't see this */
diff --git a/drivers/net/wireless/iwlwifi/iwlwifi.h b/drivers/net/wireless/iwlwifi/iwlwifi.h
index e0b97c3..432ce88 100644
--- a/drivers/net/wireless/iwlwifi/iwlwifi.h
+++ b/drivers/net/wireless/iwlwifi/iwlwifi.h
@@ -39,18 +39,13 @@ struct iwl_priv;
/* Hardware specific file defines the PCI IDs table for that hardware module */
extern struct pci_device_id iwl_hw_card_ids[];
+#include "iwl-hw.h"
#if IWL == 3945
-
#define DRV_NAME "iwl3945"
-#include "iwl-hw.h"
#include "iwl-3945-hw.h"
-
#elif IWL == 4965
-
#define DRV_NAME "iwl4965"
-#include "iwl-hw.h"
#include "iwl-4965-hw.h"
-
#endif
#include "iwl-prph.h"
diff --git a/drivers/net/wireless/p54common.c b/drivers/net/wireless/p54common.c
index 2c63cf0..1437db0 100644
--- a/drivers/net/wireless/p54common.c
+++ b/drivers/net/wireless/p54common.c
@@ -577,7 +577,7 @@ static int p54_set_filter(struct ieee80211_hw *dev, u16 filter_type,
struct p54_tx_control_filter *filter;
hdr = kzalloc(sizeof(*hdr) + sizeof(*filter) +
- priv->tx_hdr_len, GFP_KERNEL);
+ priv->tx_hdr_len, GFP_ATOMIC);
if (!hdr)
return -ENOMEM;
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index bb6f46c..ff399f8 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -550,7 +550,7 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev,
/*
* Check if we need to set the Length Extension
*/
- if (bitrate == 110 && residual <= 3)
+ if (bitrate == 110 && residual <= 30)
desc.service |= 0x80;
}
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 3e42759..46c8c08 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -2029,6 +2029,7 @@ static struct usb_device_id rt73usb_device_table[] = {
{ USB_DEVICE(0x050d, 0x7050), USB_DEVICE_DATA(&rt73usb_ops) },
{ USB_DEVICE(0x050d, 0x705a), USB_DEVICE_DATA(&rt73usb_ops) },
{ USB_DEVICE(0x050d, 0x905b), USB_DEVICE_DATA(&rt73usb_ops) },
+ { USB_DEVICE(0x050d, 0x905c), USB_DEVICE_DATA(&rt73usb_ops) },
/* Billionton */
{ USB_DEVICE(0x1631, 0xc019), USB_DEVICE_DATA(&rt73usb_ops) },
/* Buffalo */
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index 0ef887d..de61c8f 100644
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -131,7 +131,8 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
struct rtl8187_tx_hdr *hdr;
struct rtl8187_tx_info *info;
struct urb *urb;
- u32 tmp;
+ __le16 rts_dur = 0;
+ u32 flags;
urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!urb) {
@@ -139,24 +140,24 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
return 0;
}
- hdr = (struct rtl8187_tx_hdr *)skb_push(skb, sizeof(*hdr));
- tmp = skb->len - sizeof(*hdr);
- tmp |= RTL8187_TX_FLAG_NO_ENCRYPT;
- tmp |= control->rts_cts_rate << 19;
- tmp |= control->tx_rate << 24;
- if (ieee80211_get_morefrag((struct ieee80211_hdr *)skb))
- tmp |= RTL8187_TX_FLAG_MORE_FRAG;
+ flags = skb->len;
+ flags |= RTL8187_TX_FLAG_NO_ENCRYPT;
+ flags |= control->rts_cts_rate << 19;
+ flags |= control->tx_rate << 24;
+ if (ieee80211_get_morefrag((struct ieee80211_hdr *)skb->data))
+ flags |= RTL8187_TX_FLAG_MORE_FRAG;
if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS) {
- tmp |= RTL8187_TX_FLAG_RTS;
- hdr->rts_duration =
- ieee80211_rts_duration(dev, priv->if_id, skb->len, control);
+ flags |= RTL8187_TX_FLAG_RTS;
+ rts_dur = ieee80211_rts_duration(dev, priv->if_id, skb->len, control);
}
if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
- tmp |= RTL8187_TX_FLAG_CTS;
- hdr->flags = cpu_to_le32(tmp);
+ flags |= RTL8187_TX_FLAG_CTS;
+
+ hdr = (struct rtl8187_tx_hdr *)skb_push(skb, sizeof(*hdr));
+ hdr->flags = cpu_to_le32(flags);
hdr->len = 0;
- tmp = control->retry_limit << 8;
- hdr->retry = cpu_to_le32(tmp);
+ hdr->rts_duration = rts_dur;
+ hdr->retry = cpu_to_le32(control->retry_limit << 8);
info = (struct rtl8187_tx_info *)skb->cb;
info->control = kmemdup(control, sizeof(*control), GFP_ATOMIC);
@@ -587,8 +588,6 @@ static void rtl8187_configure_filter(struct ieee80211_hw *dev,
*total_flags = 0;
- if (changed_flags & FIF_PROMISC_IN_BSS)
- priv->rx_conf ^= RTL818X_RX_CONF_NICMAC;
if (changed_flags & FIF_ALLMULTI)
priv->rx_conf ^= RTL818X_RX_CONF_MULTICAST;
if (changed_flags & FIF_FCSFAIL)
@@ -601,8 +600,6 @@ static void rtl8187_configure_filter(struct ieee80211_hw *dev,
if (mc_count > 0)
priv->rx_conf |= RTL818X_RX_CONF_MULTICAST;
- if (priv->rx_conf & RTL818X_RX_CONF_NICMAC)
- *total_flags |= FIF_PROMISC_IN_BSS;
if (priv->rx_conf & RTL818X_RX_CONF_MULTICAST)
*total_flags |= FIF_ALLMULTI;
if (priv->rx_conf & RTL818X_RX_CONF_FCS)
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index 935b144..d5c0c66 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -327,8 +327,8 @@ static void zd1201_usbrx(struct urb *urb)
memcpy(skb_put(skb, 6), &data[datalen-8], 6);
memcpy(skb_put(skb, 2), &data[datalen-24], 2);
memcpy(skb_put(skb, len), data, len);
- skb->dev->last_rx = jiffies;
skb->protocol = eth_type_trans(skb, zd->dev);
+ skb->dev->last_rx = jiffies;
zd->stats.rx_packets++;
zd->stats.rx_bytes += skb->len;
netif_rx(skb);
@@ -384,8 +384,8 @@ static void zd1201_usbrx(struct urb *urb)
memcpy(skb_put(skb, 2), &data[6], 2);
memcpy(skb_put(skb, len), data+8, len);
}
- skb->dev->last_rx = jiffies;
skb->protocol = eth_type_trans(skb, zd->dev);
+ skb->dev->last_rx = jiffies;
zd->stats.rx_packets++;
zd->stats.rx_bytes += skb->len;
netif_rx(skb);
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index b0684f9..c755b69 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -1044,14 +1044,17 @@ error:
static void disconnect(struct usb_interface *intf)
{
struct net_device *netdev = zd_intf_to_netdev(intf);
- struct zd_mac *mac = zd_netdev_mac(netdev);
- struct zd_usb *usb = &mac->chip.usb;
+ struct zd_mac *mac;
+ struct zd_usb *usb;
/* Either something really bad happened, or we're just dealing with
* a DEVICE_INSTALLER. */
if (netdev == NULL)
return;
+ mac = zd_netdev_mac(netdev);
+ usb = &mac->chip.usb;
+
dev_dbg_f(zd_usb_dev(usb), "\n");
zd_netdev_disconnect(netdev);
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index a2d08c9..ff999ff 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -6643,7 +6643,8 @@ qeth_netdev_init(struct net_device *dev)
dev->vlan_rx_kill_vid = qeth_vlan_rx_kill_vid;
dev->vlan_rx_add_vid = qeth_vlan_rx_add_vid;
#endif
- dev->header_ops = &qeth_null_ops;
+ if (qeth_get_netdev_flags(card) & IFF_NOARP)
+ dev->header_ops = &qeth_null_ops;
#ifdef CONFIG_QETH_IPV6
/*IPv6 address autoconfiguration stuff*/
^ permalink raw reply related
* [ofa-general] Re: [PATCH 1/14 v2] nes: module and device initialization
From: Roland Dreier @ 2007-10-20 3:14 UTC (permalink / raw)
To: ggrundstrom; +Cc: netdev, ewg, general
In-Reply-To: <200710192001.l9JK1U8O021689@neteffect.com>
Thanks... I am kind of overloaded trying to handle the last few things
for the 2.6.24 merge window, but I will look at this next week, and I
expect we should be able to merge the driver for 2.6.25 unless there
are unexpected hangups.
^ permalink raw reply
* Re: [RFD] iptables: mangle table obsoletes filter table
From: Al Boldi @ 2007-10-20 3:40 UTC (permalink / raw)
To: Bill Davidsen
Cc: Patrick McHardy, netfilter-devel, netdev, linux-net, linux-kernel
In-Reply-To: <471699A0.3060303@tmr.com>
Bill Davidsen wrote:
> Bill Davidsen wrote:
> >>>> If not, then shouldn't the filter table be obsoleted to avoid
> >>>> confusion?
> >>>
> >>> That would probably confuse people. Just don't use it if you don't
> >>> need to.
> >
> > That is a most practical suggestion.
> >
> >> The problem is that people think they are safe with the filter table,
> >> when in fact they need the prerouting chain to seal things. Right now
> >> this is only possible in the mangle table.
> >
> > I'm not sure what you think is unsafe about using the filter table, and
> > the order of evaluation issues certainly seem to suggest that some
> > actions would take a major rethink at least. Perhaps you could avoid
> > breaking all of the setups which currently work, rather than force
> > everyone to do things differently because you feel that your way is
> > better.
>
> It was my intention to suggest that unintentional breakage of existing
> setups should be avoided, not that removing the filter table was some
> evil plot. ;-)
> On rereading my original post I failed to make that clear, please take
> it as intended.
Sure, the idea was to mark the filter table obsolete as to make people start
using the mangle table to do their filtering for new setups. The filter
table would then still be available for legacy/special setups. But this
would only be possible if we at least ported the REJECT target to mangle.
Thanks!
--
Al
^ permalink raw reply
* FYI - linux-net.osdl.org
From: Stephen Hemminger @ 2007-10-20 4:39 UTC (permalink / raw)
To: netdev
The existing wiki has been migrated into the Linux Foundation wiki system.
This is to reduce the administrative overhead and management effort.
--
Stephen Hemminger <shemminger@linux-foundation.org>
^ permalink raw reply
* Re: [RFD] iptables: mangle table obsoletes filter table
From: Valdis.Kletnieks @ 2007-10-20 4:47 UTC (permalink / raw)
To: Al Boldi
Cc: Bill Davidsen, Patrick McHardy, netfilter-devel, netdev,
linux-net, linux-kernel
In-Reply-To: <200710200640.02012.a1426z@gawab.com>
[-- Attachment #1: Type: text/plain, Size: 646 bytes --]
On Sat, 20 Oct 2007 06:40:02 +0300, Al Boldi said:
> Sure, the idea was to mark the filter table obsolete as to make people start
> using the mangle table to do their filtering for new setups. The filter
> table would then still be available for legacy/special setups. But this
> would only be possible if we at least ported the REJECT target to mangle.
That's *half* the battle. The other half is explaining why I should move
from a perfectly functional setup that uses the filter table. What gains
do I get from doing so? What isn't working that I don't know about? etc?
In other words - why do I want to move from filter to mangle?
[-- Attachment #2: Type: application/pgp-signature, Size: 226 bytes --]
^ permalink raw reply
* [ofa-general] Re: [PATCH 2/14 v2] nes: device structures and defines
From: Stephen Hemminger @ 2007-10-20 5:00 UTC (permalink / raw)
To: ggrundstrom; +Cc: netdev, rdreier, ewg, general
In-Reply-To: <200710192004.l9JK48dm021704@neteffect.com>
On Fri, 19 Oct 2007 15:04:08 -0500
ggrundstrom@neteffect.com wrote:
> Main include file for device structures and defines.
>
> Signed-off-by: Glenn Grundstrom <ggrundstrom@neteffect.com>
You are starting off on the wrong foot.
> +#ifdef CONFIG_INFINIBAND_NES_DEBUG
> +#define assert(expr) \
> +if(!(expr)) { \
> + printk(KERN_ERR PFX "Assertion failed! %s, %s, %s, line %d\n", \
> + #expr, __FILE__, __FUNCTION__, __LINE__); \
> +}
Use BUG_ON
> +#define nes_debug(level, fmt, args...) \
> + if (level & nes_debug_level) \
> + printk(KERN_ERR PFX "%s[%u]: " fmt, __FUNCTION__, __LINE__, ##args)
> +
> +#ifndef dprintk
> +#define dprintk(fmt, args...) do { printk(KERN_ERR PFX fmt, ##args); } while (0)
> +#endif
pr_debug or dev_dgg()
> +#define NES_EVENT_TIMEOUT 1200000
> +/* #define NES_EVENT_TIMEOUT 1200 */
> +#else
> +#define assert(expr) do {} while (0)
> +#define nes_debug(level, fmt, args...)
> +#define dprintk(fmt, args...) do {} while (0)
> +
> +#define NES_EVENT_TIMEOUT 100000
> +#endif
> +
> +#include "nes_hw.h"
> +#include "nes_verbs.h"
> +#include "nes_context.h"
> +#include "nes_user.h"
> +#include "nes_cm.h"
> +
> +extern int max_mtu;
> +extern int nics_per_function;
> +#define max_frame_len (max_mtu+ETH_HLEN)
> +extern int interrupt_mod_interval;
> +extern int nes_if_count;
> +extern int mpa_version;
> +extern int disable_mpa_crc;
> +extern unsigned int send_first;
> +extern unsigned int nes_drv_opt;
> +extern unsigned int nes_debug_level;
Lots of GLOBAL symbols that should be local to the driver.
Also you want to be able to set them per board, not for the whol driver.
> +
> +static inline int nes_skb_is_gso(const struct sk_buff *skb)
> +{
> + return skb_shinfo(skb)->gso_size;
> +}
> +
> +#define nes_skb_linearize(_skb) skb_linearize(_skb)
> +
Why the silly wrappers?
> +/* Read from memory-mapped device */
> +static inline u32 nes_read_indexed(struct nes_device *nesdev, u32 reg_index)
> +{
> + unsigned long flags;
> + void __iomem *addr = nesdev->index_reg;
> + u32 value;
> +
> + spin_lock_irqsave(&nesdev->indexed_regs_lock, flags);
> +
> + writel(reg_index, addr);
> + value = readl((void __iomem *)addr + 4);
> +
> + spin_unlock_irqrestore(&nesdev->indexed_regs_lock, flags);
> + return value;
> +}
Bad feeling, I smell bad locking coming.
> +static inline u32 nes_read32(const void __iomem* addr)
> +{
> + return readl(addr);
> +}
> +
> +static inline u16 nes_read16(const void __iomem* addr)
> +{
> + return readw(addr);
> +}
> +
> +static inline u8 nes_read8(const void __iomem* addr)
> +{
> + return readb(addr);
> +}
More silly wrappers.
> +/* Write to memory-mapped device */
> +static inline void nes_write_indexed(struct nes_device *nesdev, u32 reg_index, u32 val)
> +{
> + unsigned long flags;
> + void __iomem *addr = nesdev->index_reg;
> +
> + spin_lock_irqsave(&nesdev->indexed_regs_lock, flags);
> +
> + writel(reg_index, addr);
> + writel(val, (void __iomem *)addr + 4);
> +
> + spin_unlock_irqrestore(&nesdev->indexed_regs_lock, flags);
> +}
> +static inline void nes_write32(void __iomem *addr, u32 val)
> +{
> + writel(val, addr);
> +}
> +
> +static inline void nes_write16(void __iomem *addr, u16 val)
> +{
> + writew(val, addr);
> +}
> +
> +static inline void nes_write8(void __iomem *addr, u8 val)
> +{
> + writeb(val, addr);
> +}
> +
> +
> +
> +static inline int nes_alloc_resource(struct nes_adapter *nesadapter,
> + unsigned long *resource_array, u32 max_resources,
> + u32 *req_resource_num, u32 *next)
> +{
> + unsigned long flags;
> + u32 resource_num;
> +
> + spin_lock_irqsave(&nesadapter->resource_lock, flags);
> +
> + resource_num = find_next_zero_bit(resource_array, max_resources, *next);
> + if (resource_num >= max_resources) {
> + resource_num = find_first_zero_bit(resource_array, max_resources);
> + if (resource_num >= max_resources) {
> + printk(KERN_ERR PFX "%s: No available resourcess.\n", __FUNCTION__);
> + spin_unlock_irqrestore(&nesadapter->resource_lock, flags);
> + return -EMFILE;
> + }
> + }
> + nes_debug(NES_DBG_HW, "find_next_zero_bit returned = %u (max = %u).\n",
> + resource_num, max_resources);
> + set_bit(resource_num, resource_array);
> + *next = resource_num+1;
> + if (*next == max_resources) {
> + *next = 0;
> + }
> + spin_unlock_irqrestore(&nesadapter->resource_lock, flags);
> + *req_resource_num = resource_num;
> +
> + return 0;
> +}
Big fat initialization routine that shouldn't be as device inline.
> +static inline int nes_is_resource_allocated(struct nes_adapter *nesadapter,
> + unsigned long *resource_array, u32 resource_num)
> +{
> + unsigned long flags;
> + int bit_is_set;
> +
> + spin_lock_irqsave(&nesadapter->resource_lock, flags);
> +
> + bit_is_set = test_bit(resource_num, resource_array);
> + nes_debug(NES_DBG_HW, "resource_num %u is%s allocated.\n",
> + resource_num, (bit_is_set ? "": " not"));
> + spin_unlock_irqrestore(&nesadapter->resource_lock, flags);
> +
> + return bit_is_set;
> +}
What resource, how about a comment?
> +static inline void nes_free_resource(struct nes_adapter *nesadapter,
> + unsigned long *resource_array, u32 resource_num)
> +{
> + unsigned long flags;
> +
> + spin_lock_irqsave(&nesadapter->resource_lock, flags);
> + clear_bit(resource_num, resource_array);
> + spin_unlock_irqrestore(&nesadapter->resource_lock, flags);
> +}
> +
> +static inline struct nes_vnic *to_nesvnic(struct ib_device *ibdev) {
> + return(container_of(ibdev, struct nes_ib_device, ibdev)->nesvnic);
return container_of(ibdev, struct nes_ib_device, ibdev)->nesvnic;
> +static inline struct nes_pd *to_nespd(struct ib_pd *ibpd) {
> + return(container_of(ibpd, struct nes_pd, ibpd));
> +}
> +
> +static inline struct nes_ucontext *to_nesucontext(struct ib_ucontext *ibucontext) {
> + return(container_of(ibucontext, struct nes_ucontext, ibucontext));
> +}
> +
> +static inline struct nes_mr *to_nesmr(struct ib_mr *ibmr) {
> + return(container_of(ibmr, struct nes_mr, ibmr));
> +}
> +
> +static inline struct nes_mr *to_nesmr_from_ibfmr(struct ib_fmr *ibfmr) {
> + return(container_of(ibfmr, struct nes_mr, ibfmr));
> +}
> +
> +static inline struct nes_mr *to_nesmw(struct ib_mw *ibmw) {
> + return(container_of(ibmw, struct nes_mr, ibmw));
> +}
> +
> +static inline struct nes_fmr *to_nesfmr(struct nes_mr *nesmr) {
> + return(container_of(nesmr, struct nes_fmr, nesmr));
> +}
> +
> +static inline struct nes_cq *to_nescq(struct ib_cq *ibcq) {
> + return(container_of(ibcq, struct nes_cq, ibcq));
> +}
> +
> +static inline struct nes_qp *to_nesqp(struct ib_qp *ibqp) {
> + return(container_of(ibqp, struct nes_qp, ibqp));
> +}
> +
> +
> +#define NES_CQP_REQUEST_NOT_HOLDING_LOCK 0
> +#define NES_CQP_REQUEST_HOLDING_LOCK 1
> +#define NES_CQP_REQUEST_NO_DOORBELL_RING 0
> +#define NES_CQP_REQUEST_RING_DOORBELL 1
> +
> +static inline struct nes_cqp_request
> + *nes_get_cqp_request(struct nes_device *nesdev, int holding_lock) {
Any code like that has conditional locking is indication of poor design.
It also makes static analysis tools harder.
> + unsigned long flags;
> + struct nes_cqp_request *cqp_request = NULL;
> +
> + if (!holding_lock) {
> + spin_lock_irqsave(&nesdev->cqp.lock, flags);
> + }
> + if (!list_empty(&nesdev->cqp_avail_reqs)) {
> + cqp_request = list_entry(nesdev->cqp_avail_reqs.next,
> + struct nes_cqp_request, list);
> + atomic_inc(&cqp_reqs_allocated);
> + list_del_init(&cqp_request->list);
> + } else if (!holding_lock) {
> + spin_unlock_irqrestore(&nesdev->cqp.lock, flags);
> + cqp_request = kzalloc(sizeof(struct nes_cqp_request),
> + GFP_KERNEL);
> + if (cqp_request) {
> + cqp_request->dynamic = 1;
> + INIT_LIST_HEAD(&cqp_request->list);
> + atomic_inc(&cqp_reqs_dynallocated);
> + }
> + spin_lock_irqsave(&nesdev->cqp.lock, flags);
> + }
> + if (!holding_lock) {
> + spin_unlock_irqrestore(&nesdev->cqp.lock, flags);
> + }
> +
> + if (cqp_request) {
> + init_waitqueue_head(&cqp_request->waitq);
> + cqp_request->waiting = 0;
> + cqp_request->request_done = 0;
> + init_waitqueue_head(&cqp_request->waitq);
> + nes_debug(NES_DBG_CQP, "Got cqp request %p from the available list \n",
> + cqp_request);
> + } else
> + printk(KERN_ERR PFX "%s: Could not allocated a CQP request.\n",
> + __FUNCTION__);
> +
> + return cqp_request;
> +}
> +
> +static inline void nes_post_cqp_request(struct nes_device *nesdev,
> + struct nes_cqp_request *cqp_request, int holding_lock, int ring_doorbell)
> +{
> + /* caller must be holding CQP lock */
> + struct nes_hw_cqp_wqe *cqp_wqe;
> + unsigned long flags;
> + u32 cqp_head;
> +
> + if (!holding_lock) {
> + spin_lock_irqsave(&nesdev->cqp.lock, flags);
> + }
> +
> + if (((((nesdev->cqp.sq_tail+(nesdev->cqp.sq_size*2))-nesdev->cqp.sq_head) &
> + (nesdev->cqp.sq_size - 1)) != 1)
> + && (list_empty(&nesdev->cqp_pending_reqs))) {
> + cqp_head = nesdev->cqp.sq_head++;
> + nesdev->cqp.sq_head &= nesdev->cqp.sq_size-1;
> + cqp_wqe = &nesdev->cqp.sq_vbase[cqp_head];
> + memcpy(cqp_wqe, &cqp_request->cqp_wqe, sizeof(*cqp_wqe));
> + barrier();
> + cqp_wqe->wqe_words[NES_CQP_WQE_COMP_SCRATCH_LOW_IDX] = cpu_to_le32((u32)((u64)(cqp_request)));
> + cqp_wqe->wqe_words[NES_CQP_WQE_COMP_SCRATCH_HIGH_IDX] = cpu_to_le32((u32)(((u64)(cqp_request))>>32));
> + nes_debug(NES_DBG_CQP, "CQP request (opcode 0x%02X), line 1 = 0x%08X put on CQPs SQ,"
> + " request = %p, cqp_head = %u, cqp_tail = %u, cqp_size = %u,"
> + " waiting = %d, refcount = %d.\n",
> + le32_to_cpu(cqp_wqe->wqe_words[NES_CQP_WQE_OPCODE_IDX])&0x3f,
> + le32_to_cpu(cqp_wqe->wqe_words[NES_CQP_WQE_ID_IDX]), cqp_request,
> + nesdev->cqp.sq_head, nesdev->cqp.sq_tail, nesdev->cqp.sq_size,
> + cqp_request->waiting, atomic_read(&cqp_request->refcount));
> + barrier();
> + if (ring_doorbell) {
> + /* Ring doorbell (1 WQEs) */
> + nes_write32(nesdev->regs+NES_WQE_ALLOC, 0x01800000 | nesdev->cqp.qp_id);
> + }
> +
> + barrier();
> + } else {
> + atomic_inc(&cqp_reqs_queued);
> + nes_debug(NES_DBG_CQP, "CQP request %p (opcode 0x%02X), line 1 = 0x%08X"
> + " put on the pending queue.\n",
> + cqp_request,
> + cqp_request->cqp_wqe.wqe_words[NES_CQP_WQE_OPCODE_IDX]&0x3f,
> + cqp_request->cqp_wqe.wqe_words[NES_CQP_WQE_ID_IDX]);
> + list_add_tail(&cqp_request->list, &nesdev->cqp_pending_reqs);
> + }
> +
> + if (!holding_lock) {
> + spin_unlock_irqrestore(&nesdev->cqp.lock, flags);
> + }
> +
> + return;
> +}
> +
You really think that you need to have a function this big inline in the header file.
> +
> +/* Utils */
> +#define CRC32C_POLY 0x1EDC6F41
Linux has a perfectly good crc32 library routine, use it!
--
Stephen Hemminger <shemminger@linux-foundation.org>
^ permalink raw reply
* [ofa-general] Re: [PATCH 2/14 v2] nes: device structures and defines
From: Roland Dreier @ 2007-10-20 5:22 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev, ewg, general
In-Reply-To: <20071019220015.3faa9bbb@freepuppy.rosehill>
> You are starting off on the wrong foot.
???
> > +if(!(expr)) { \
> > + printk(KERN_ERR PFX "Assertion failed! %s, %s, %s, line %d\n", \
> > + #expr, __FILE__, __FUNCTION__, __LINE__); \
> > +}
>
> Use BUG_ON
I agree that there's no need to invent a driver-private assertion
macro, but (to first order at least) drivers should never use BUG_ON.
I don't want some glitch in a network driver that the system could
probably survive to be turned into a panic by BUG_ON -- WARN_ON seems
infinitely preferable.
- R.
^ permalink raw reply
* [ofa-general] Re: [PATCH 2/14 v2] nes: device structures and defines
From: Stephen Hemminger @ 2007-10-20 5:26 UTC (permalink / raw)
To: Roland Dreier; +Cc: netdev, ewg, general
In-Reply-To: <adaabqebbrv.fsf@cisco.com>
On Fri, 19 Oct 2007 22:22:44 -0700
Roland Dreier <rdreier@cisco.com> wrote:
> > You are starting off on the wrong foot.
>
> ???
That was a introductory comment because even in reviewing the first
file (which had almost no code), I saw so many style issues.
> > > +if(!(expr)) { \
> > > + printk(KERN_ERR PFX "Assertion failed! %s, %s, %s, line %d\n", \
> > > + #expr, __FILE__, __FUNCTION__, __LINE__); \
> > > +}
> >
> > Use BUG_ON
>
> I agree that there's no need to invent a driver-private assertion
> macro, but (to first order at least) drivers should never use BUG_ON.
> I don't want some glitch in a network driver that the system could
> probably survive to be turned into a panic by BUG_ON -- WARN_ON seems
> infinitely preferable.
>
> - R.
--
Stephen Hemminger <shemminger@linux-foundation.org>
^ permalink raw reply
* Re: [BUG] powerpc does not save msi state [was Re: [PATCH 5/7] pci: Export the pci_restore_msi_state() function
From: Michael Ellerman @ 2007-10-20 6:43 UTC (permalink / raw)
To: David Miller; +Cc: linas, linuxppc-dev, mchan, mcarlson, netdev, linux-pci
In-Reply-To: <20071019.175308.54212640.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 1576 bytes --]
On Fri, 2007-10-19 at 17:53 -0700, David Miller wrote:
> From: linas@austin.ibm.com (Linas Vepstas)
> Date: Fri, 19 Oct 2007 19:46:10 -0500
>
> > FWIW, it looks like not all that many arches do this; the output
> > for grep -r address_hi * is pretty thin. Then, looking at
> > i386/kernel/io_apic.c as an example, one can see that the
> > msi state save happens "by accident" if CONFIG_SMP is enabled;
> > and so its surely broekn on uniprocesor machines.
>
> I don't see this, in all cases write_msi_msg() will transfer
> the given "*msg" to entry->msg by this assignment in
> drivers/pci/msi.c:
>
> void write_msi_msg(unsigned int irq, struct msi_msg *msg)
> {
> ...
> entry->msg = *msg;
> }
>
> So as long as write_msi_msg() is invoked, it will be saved
> properly.
>
> Platforms need not do this explicitly.
I'm short on context here, and it's Saturday, so excuse me if I'm
missing the point somewhere.
On pseries machines we don't call write_msi_msg(), because we don't
control the contents of the message, firmware does. So entry->msg will
be bogus.
That's a pity, but AFAIK it shouldn't be a problem because we don't
enable CONFIG_PM on those machines anyway. If we ever want to we'll need
to sort out with firmware how that will work WRT restoring MSI state.
cheers
--
Michael Ellerman
OzLabs, IBM Australia Development Lab
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)
We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: linux kernel networking code review request
From: Ilpo Järvinen @ 2007-10-20 7:05 UTC (permalink / raw)
To: Templin, Fred L; +Cc: Netdev, Dmitry Torokhov
In-Reply-To: <200710192215.19850.dmitry.torokhov@gmail.com>
On Fri, 19 Oct 2007, Dmitry Torokhov wrote:
> On Friday 19 October 2007, Templin, Fred L wrote:
> > Hello,
> >
> > I would like to get a review on some new Linux
> > kernel networking code. The code is based on the
> > 2.6.23 source tree and touches three files - two
> > in ./net/ipv6 and one in ./include/net. What is
> > the proper procedure for requesting a review?
> >
>
> Just don your flameproof pants and post the changes here ;)
In addition, check what is being said in Documentation/SubmittingPatches
:-)
--
i.
^ permalink raw reply
* hello!
From: am kara @ 2007-10-20 8:28 UTC (permalink / raw)
To: netdev
Dear Sir/Madam,
I am looking for a patch or a new code for Fast
Ethernet Controller physical driver located at
drivers/net/e100.c, Linux kernel 2.6.23, with Large
Send Support(TCP Segmentation Offload), adaptor: Intel
PRO/100 M,82551QM.
I wonder if you know such driver exist and where to
obtain its source code.
Thank you to read my email,
Am Kara.
PS. My email is:
am_kara@yahoo.com
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
^ permalink raw reply
* Re: PROBLEM: oops, Linus tree: 2.6.23-g4fa4d23f, BUG: unable to handle kernel NULL pointer dereference at virtual address 00000004
From: Jiri Kosina @ 2007-10-20 10:54 UTC (permalink / raw)
To: Dave Haywood; +Cc: linux-kernel, netdev, Pavel Emelyanov
In-Reply-To: <4719B727.7090908@oak.selfip.net>
added some relevant CCs
On Sat, 20 Oct 2007, Dave Haywood wrote:
> BUG: unable to handle kernel NULL pointer dereference at virtual address 00000004
>
> Linux s1 2.6.23-g4fa4d23f #4 Fri Oct 19 10:15:50 BST 2007 i686 Pentium III (Coppermine) GenuineIntel GNU/Linux
>
> Gnu C 4.2.0
> Gnu make 3.81
> binutils 2.18
> util-linux 2.12r
> mount 2.12r
> module-init-tools 3.2.2
> e2fsprogs 1.40.2
> PPP 2.4.4
> Linux C Library 2.6.1
> Dynamic linker (ldd) 2.6.1
> Procps 3.2.7
> Net-tools 1.60
> Kbd 1.13
> Sh-utils 6.9
> udev 115
>
> Linux version 2.6.23-g4fa4d23f (tla@s1) (gcc version 4.2.0 (Gentoo 4.2.0 p1.4)) #4 Fri Oct 19 10:15:50 BST 2007
> BIOS-provided physical RAM map:
> BIOS-e820: 0000000000000000 - 000000000009fc00 (usable)
> BIOS-e820: 000000000009fc00 - 00000000000a0000 (reserved)
> BIOS-e820: 00000000000e0000 - 0000000000100000 (reserved)
> BIOS-e820: 0000000000100000 - 000000000fed0000 (usable)
> BIOS-e820: 000000000fed0000 - 000000000fef0000 (ACPI NVS)
> BIOS-e820: 000000000fef0000 - 000000000ff00000 (usable)
> BIOS-e820: 00000000feea0000 - 0000000100000000 (reserved)
> 0MB HIGHMEM available.
> 255MB LOWMEM available.
> found SMP MP-table at 000f9bf0
> Entering add_active_range(0, 0, 65280) 0 entries of 256 used
> Zone PFN ranges:
> DMA 0 -> 4096
> Normal 4096 -> 65280
> HighMem 65280 -> 65280
> Movable zone start PFN for each node
> early_node_map[1] active PFN ranges
> 0: 0 -> 65280
> On node 0 totalpages: 65280
> DMA zone: 32 pages used for memmap
> DMA zone: 0 pages reserved
> DMA zone: 4064 pages, LIFO batch:0
> Normal zone: 478 pages used for memmap
> Normal zone: 60706 pages, LIFO batch:15
> HighMem zone: 0 pages used for memmap
> Movable zone: 0 pages used for memmap
> DMI 2.3 present.
> Using APIC driver default
> ACPI: RSDP 000E0010, 0014 (r0 COMPAQ)
> ACPI: RSDT 000E0080, 0054 (r1 COMPAQ CPQ0014 20010612 0)
> ACPI: FACP 000E0130, 0074 (r1 COMPAQ SOLANO 1 0)
> ACPI: DSDT 000E0204, 0CE6 (r1 COMPAQ DSDT 1 MSFT 100000D)
> ACPI: FACS 000E0040, 0040
> ACPI: SSDT 000E0EEA, 0174 (r1 COMPAQ CORE_UTL 1 MSFT 100000D)
> ACPI: SSDT 000E105E, 0D3D (r1 COMPAQ VILLTBL1 1 MSFT 100000D)
> ACPI: APIC 000E01A4, 0060 (r1 COMPAQ SOLANO 1 0)
> ACPI: SSDT 000E2D4F, 0076 (r1 COMPAQ APIC 1 MSFT 100000D)
> ACPI: SSDT 000E1D9B, 06AD (r1 COMPAQ PNP_PRSS 1 MSFT 100000D)
> ACPI: SSDT 000E24A6, 01A4 (r1 COMPAQ S3 1 MSFT 100000D)
> ACPI: SSDT 000E264A, 0158 (r1 COMPAQ PIDETM 1 MSFT 100000D)
> ACPI: SSDT 000E28FF, 010B (r1 COMPAQ GTF0 1 MSFT 100000D)
> ACPI: SSDT 000E27A2, 015D (r1 COMPAQ SIDETM 1 MSFT 100000D)
> ACPI: SSDT 000E2B21, 0117 (r1 COMPAQ GTF2 1 MSFT 100000D)
> ACPI: SSDT 000E2EAD, 004E (r1 COMPAQ FINIS 1 MSFT 100000D)
> ACPI: PM-Timer IO Port: 0xf808
> ACPI: Local APIC address 0xfee00000
> ACPI: LAPIC (acpi_id[0x01] lapic_id[0x00] enabled)
> Processor #0 6:8 APIC version 17
> ACPI: LAPIC_NMI (acpi_id[0x01] high edge lint[0x1])
> ACPI: LAPIC_NMI (acpi_id[0x02] high edge lint[0x1])
> ACPI: IOAPIC (id[0x08] address[0xfec00000] gsi_base[0])
> IOAPIC[0]: apic_id 8, version 32, address 0xfec00000, GSI 0-23
> ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl)
> ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 high level)
> ACPI: IRQ0 used by override.
> ACPI: IRQ2 used by override.
> ACPI: IRQ9 used by override.
> Enabling APIC mode: Flat. Using 1 I/O APICs
> Using ACPI (MADT) for SMP configuration information
> Allocating PCI resources starting at 10000000 (gap: 0ff00000:eefa0000)
> swsusp: Registered nosave memory region: 000000000009f000 - 00000000000a0000
> swsusp: Registered nosave memory region: 00000000000a0000 - 00000000000e0000
> swsusp: Registered nosave memory region: 00000000000e0000 - 0000000000100000
> swsusp: Registered nosave memory region: 000000000fed0000 - 000000000fef0000
> Built 1 zonelists in Zone order, mobility grouping on. Total pages: 64770
> Kernel command line: root=/dev/md4
> mapped APIC to ffffb000 (fee00000)
> mapped IOAPIC to ffffa000 (fec00000)
> Enabling fast FPU save and restore... done.
> Enabling unmasked SIMD FPU exception support... done.
> Initializing CPU#0
> PID hash table entries: 1024 (order: 10, 4096 bytes)
> Detected 930.368 MHz processor.
> Console: colour VGA+ 80x25
> console [tty0] enabled
> Dentry cache hash table entries: 32768 (order: 5, 131072 bytes)
> Inode-cache hash table entries: 16384 (order: 4, 65536 bytes)
> Memory: 252820k/261120k available (3213k kernel code, 7612k reserved, 1274k data, 264k init, 0k highmem)
> virtual kernel memory layout:
> fixmap : 0xfffa7000 - 0xfffff000 ( 352 kB)
> pkmap : 0xff800000 - 0xffc00000 (4096 kB)
> vmalloc : 0xd0800000 - 0xff7fe000 ( 751 MB)
> lowmem : 0xc0000000 - 0xcff00000 ( 255 MB)
> .init : 0xc0564000 - 0xc05a6000 ( 264 kB)
> .data : 0xc04236bc - 0xc0561f08 (1274 kB)
> .text : 0xc0100000 - 0xc04236bc (3213 kB)
> Checking if this processor honours the WP bit even in supervisor mode... Ok.
> SLUB: Genslabs=11, HWalign=32, Order=0-1, MinObjects=4, CPUs=1, Nodes=1
> Calibrating delay using timer specific routine.. 1862.06 BogoMIPS (lpj=3724128)
> Mount-cache hash table entries: 512
> CPU: After generic identify, caps: 0383fbff 00000000 00000000 00000000 00000000 00000000 00000000 00000000
> CPU: L1 I cache: 16K, L1 D cache: 16K
> CPU: L2 cache: 256K
> CPU: After all inits, caps: 0383fbff 00000000 00000000 00000040 00000000 00000000 00000000 00000000
> Intel machine check architecture supported.
> Intel machine check reporting enabled on CPU#0.
> Compat vDSO mapped to ffffe000.
> CPU: Intel Pentium III (Coppermine) stepping 06
> Checking 'hlt' instruction... OK.
> Freeing SMP alternatives: 0k freed
> ACPI: Core revision 20070126
> Parsing all Control Methods:
> Table [DSDT](id 0001) - 147 Objects with 18 Devices 32 Methods 2 Regions
> Parsing all Control Methods:
> Table [SSDT](id 0002) - 3 Objects with 0 Devices 3 Methods 0 Regions
> Parsing all Control Methods:
> Table [SSDT](id 0003) - 100 Objects with 9 Devices 23 Methods 5 Regions
> Parsing all Control Methods:
> Table [SSDT](id 0004) - 4 Objects with 1 Devices 1 Methods 0 Regions
> Parsing all Control Methods:
> Table [SSDT](id 0005) - 21 Objects with 0 Devices 10 Methods 1 Regions
> Parsing all Control Methods:
> Table [SSDT](id 0006) - 11 Objects with 0 Devices 8 Methods 0 Regions
> Parsing all Control Methods:
> Table [SSDT](id 0007) - 19 Objects with 1 Devices 5 Methods 2 Regions
> Parsing all Control Methods:
> Table [SSDT](id 0008) - 5 Objects with 1 Devices 3 Methods 0 Regions
> Parsing all Control Methods:
> Table [SSDT](id 0009) - 19 Objects with 1 Devices 5 Methods 2 Regions
> Parsing all Control Methods:
> Table [SSDT](id 000A) - 5 Objects with 1 Devices 3 Methods 0 Regions
> Parsing all Control Methods:
> Table [SSDT](id 000B) - 2 Objects with 0 Devices 2 Methods 0 Regions
> tbxface-0598 [00] tb_load_namespace : ACPI Tables successfully acquired
> evxfevnt-0091 [00] enable : Transition to ACPI mode successful
> ENABLING IO-APIC IRQs
> ..TIMER: vector=0x31 apic1=0 pin1=2 apic2=-1 pin2=-1
> net_namespace: 64 bytes
> NET: Registered protocol family 16
> ACPI: bus type pci registered
> PCI: PCI BIOS revision 2.10 entry at 0xe8316, last bus=2
> PCI: Using configuration type 1
> Setting up standard PCI resources
> evgpeblk-0956 [00] ev_create_gpe_block : GPE 00 to 0F [_GPE] 2 regs on int 0x9
> evgpeblk-1052 [00] ev_initialize_gpe_bloc: Found 4 Wake, Enabled 0 Runtime GPEs in this block
> ACPI: EC: Look up EC in DSDT
> Completing Region/Field/Buffer/Package initialization:............................................
> Initialized 8/12 Regions 0/0 Fields 31/31 Buffers 5/12 Packages (345 nodes)
> Initializing Device/Processor/Thermal objects by executing _INI methods:.
> Executed 1 _INI methods requiring 0 _STA executions (examined 35 objects)
> ACPI: Interpreter enabled
> ACPI: (supports S0 S1 S3 S4 S5)
> ACPI: Using IOAPIC for interrupt routing
> ACPI: PCI Root Bridge [PCI0] (0000:00)
> PCI quirk: region f800-f87f claimed by ICH4 ACPI/GPIO/TCO
> PCI quirk: region fa00-fa3f claimed by ICH4 GPIO
> PCI: Transparent bridge - 0000:00:1e.0
> ACPI: PCI Interrupt Routing Table [\_SB_.PCI0._PRT]
> ACPI: PCI Interrupt Routing Table [\_SB_.PCI0.HUB_._PRT]
> ACPI: PCI Interrupt Link [LNKA] (IRQs 3 4 *5 6 7 10 11 14 15)
> ACPI: PCI Interrupt Link [LNKB] (IRQs 3 4 5 6 7 10 11 14 15) *9
> ACPI: PCI Interrupt Link [LNKC] (IRQs 3 4 5 6 7 *10 11 14 15)
> ACPI: PCI Interrupt Link [LNKD] (IRQs 3 4 5 6 7 10 *11 14 15)
> Linux Plug and Play Support v0.97 (c) Adam Belay
> pnp: PnP ACPI init
> ACPI: bus type pnp registered
> pnp: PnP ACPI: found 15 devices
> ACPI: ACPI bus type pnp unregistered
> SCSI subsystem initialized
> libata version 3.00 loaded.
> usbcore: registered new interface driver usbfs
> usbcore: registered new interface driver hub
> usbcore: registered new device driver usb
> PCI: Using ACPI for IRQ routing
> PCI: If a device doesn't work, try "pci=routeirq". If it helps, post a report
> Time: tsc clocksource has been installed.
> system 00:0c: ioport range 0x4d0-0x4d1 has been reserved
> system 00:0d: ioport range 0x400-0x41f has been reserved
> system 00:0d: ioport range 0x420-0x43f has been reserved
> system 00:0d: ioport range 0x440-0x45f has been reserved
> system 00:0d: ioport range 0x460-0x47f has been reserved
> system 00:0d: ioport range 0xf800-0xf81f has been reserved
> system 00:0d: ioport range 0xf820-0xf83f has been reserved
> system 00:0d: ioport range 0xf840-0xf85f has been reserved
> system 00:0d: ioport range 0xf860-0xf87f has been reserved
> system 00:0e: iomem range 0x0-0x9ffff could not be reserved
> system 00:0e: iomem range 0xe0000-0xfffff could not be reserved
> system 00:0e: iomem range 0x100000-0xfefffff could not be reserved
> system 00:0e: iomem range 0xfff80000-0xffffffff could not be reserved
> PCI: Bridge: 0000:00:1e.0
> IO window: 1000-1fff
> MEM window: 40000000-407fffff
> PREFETCH window: disabled.
> PCI: Setting latency timer of device 0000:00:1e.0 to 64
> NET: Registered protocol family 2
> IP route cache hash table entries: 2048 (order: 1, 8192 bytes)
> TCP established hash table entries: 8192 (order: 4, 65536 bytes)
> TCP bind hash table entries: 8192 (order: 3, 32768 bytes)
> TCP: Hash tables configured (established 8192 bind 8192)
> TCP reno registered
> Machine check exception polling timer started.
> IA-32 Microcode Update Driver: v1.14a <tigran@aivazian.fsnet.co.uk>
> Total HugeTLB memory allocated, 0
> io scheduler noop registered
> io scheduler cfq registered (default)
> Boot video device is 0000:00:02.0
> input: Power Button (FF) as /devices/virtual/input/input0
> ACPI: Power Button (FF) [PWRF]
> input: Power Button (CM) as /devices/virtual/input/input1
> ACPI: Power Button (CM) [PBTN]
> ACPI: Processor [CPU0] (supports 8 throttling states)
> Real Time Clock Driver v1.12ac
> intel_rng: FWH not detected
> Linux agpgart interface v0.102
> agpgart: Detected an Intel i815 Chipset.
> agpgart: AGP aperture is 64M @ 0x44000000
> Serial: 8250/16550 driver $Revision: 1.90 $ 4 ports, IRQ sharing disabled
> serial8250: ttyS0 at I/O 0x3f8 (irq = 4) is a 16550A
> serial8250: ttyS1 at I/O 0x2f8 (irq = 3) is a 16550A
> 00:08: ttyS0 at I/O 0x3f8 (irq = 4) is a 16550A
> 00:09: ttyS1 at I/O 0x2f8 (irq = 3) is a 16550A
> FDC 0 is a post-1991 82077
> RAMDISK driver initialized: 16 RAM disks of 4096K size 1024 blocksize
> loop: module loaded
> Intel(R) PRO/1000 Network Driver - version 7.3.20-k2
> Copyright (c) 1999-2006 Intel Corporation.
> e100: Intel(R) PRO/100 Network Driver, 3.5.23-k4-NAPI
> e100: Copyright(c) 1999-2006 Intel Corporation
> 8139too Fast Ethernet driver 0.9.28
> ACPI: PCI Interrupt 0000:02:09.0[A] -> GSI 17 (level, low) -> IRQ 16
> eth0: RealTek RTL8139 at 0xd0816000, 00:05:5d:49:eb:21, IRQ 16
> eth0: Identified 8139 chip type 'RTL-8139C'
> ACPI: PCI Interrupt 0000:02:0a.0[A] -> GSI 18 (level, low) -> IRQ 17
> eth1: RealTek RTL8139 at 0xd0818000, 00:10:b5:ac:ea:7d, IRQ 17
> eth1: Identified 8139 chip type 'RTL-8139B'
> console [netcon0] enabled
> netconsole: network logging started
> Uniform Multi-Platform E-IDE driver Revision: 7.00alpha2
> ide: Assuming 33MHz system bus speed for PIO modes; override with idebus=xx
> ICH: IDE controller at PCI slot 0000:00:1f.1
> ICH: chipset revision 2
> ICH: not 100% native mode: will probe irqs later
> ide0: BM-DMA at 0x2460-0x2467, BIOS settings: hda:DMA, hdb:pio
> ide1: BM-DMA at 0x2468-0x246f, BIOS settings: hdc:DMA, hdd:pio
> Probing IDE interface ide0...
> Switched to high resolution mode on CPU 0
> hda: Maxtor 6G160P0, ATA DISK drive
> hda: host max PIO4 wanted PIO255(auto-tune) selected PIO4
> hda: selected mode 0x44
> ide0 at 0x1f0-0x1f7,0x3f6 on irq 14
> Probing IDE interface ide1...
> hdc: Maxtor 6G160P0, ATA DISK drive
> hdc: host max PIO4 wanted PIO255(auto-tune) selected PIO4
> hdc: selected mode 0x44
> ide1 at 0x170-0x177,0x376 on irq 15
> hda: max request size: 512KiB
> hda: 312581808 sectors (160041 MB) w/8192KiB Cache, CHS=19457/255/63, UDMA(66)
> hda: cache flushes supported
> hda: hda1 hda2 hda3 hda4
> hdc: max request size: 512KiB
> hdc: 312581808 sectors (160041 MB) w/8192KiB Cache, CHS=19457/255/63, UDMA(66)
> hdc: cache flushes supported
> hdc: hdc1 hdc2 hdc3 hdc4
> Fusion MPT base driver 3.04.06
> Copyright (c) 1999-2007 LSI Corporation
> Fusion MPT SPI Host driver 3.04.06
> ieee1394: raw1394: /dev/raw1394 device initialized
> usbmon: debugfs is not available
> ohci_hcd: 2006 August 04 USB 1.1 'Open' Host Controller (OHCI) Driver
> USB Universal Host Controller Interface driver v3.0
> ACPI: PCI Interrupt 0000:00:1f.2[D] -> GSI 19 (level, low) -> IRQ 18
> PCI: Setting latency timer of device 0000:00:1f.2 to 64
> uhci_hcd 0000:00:1f.2: UHCI Host Controller
> uhci_hcd 0000:00:1f.2: new USB bus registered, assigned bus number 1
> uhci_hcd 0000:00:1f.2: irq 18, io base 0x00002440
> usb usb1: configuration #1 chosen from 1 choice
> hub 1-0:1.0: USB hub found
> hub 1-0:1.0: 2 ports detected
> usbcore: registered new interface driver usblp
> Initializing USB Mass Storage driver...
> usbcore: registered new interface driver usb-storage
> USB Mass Storage support registered.
> PNP: PS/2 Controller [PNP0303:KBD,PNP0f0e:PS2M] at 0x60,0x64 irq 1,12
> serio: i8042 KBD port at 0x60,0x64 irq 1
> serio: i8042 AUX port at 0x60,0x64 irq 12
> mice: PS/2 mouse device common for all mice
> input: AT Translated Set 2 keyboard as /devices/platform/i8042/serio0/input/input2
> md: raid1 personality registered for level 1
> usbcore: registered new interface driver usbhid
> drivers/hid/usbhid/hid-core.c: v2.6:USB HID core driver
> Netfilter messages via NETLINK v0.30.
> nf_conntrack version 0.5.0 (4096 buckets, 16384 max)
> ctnetlink v0.93: registering with nfnetlink.
> ip_tables: (C) 2000-2006 Netfilter Core Team
> ClusterIP Version 0.8 loaded successfully
> arp_tables: (C) 2002 David S. Miller
> TCP cubic registered
> NET: Registered protocol family 1
> NET: Registered protocol family 10
> ip6_tables: (C) 2000-2006 Netfilter Core Team
> IPv6 over IPv4 tunneling driver
> NET: Registered protocol family 17
> Using IPI Shortcut mode
> input: ImPS/2 Logitech Wheel Mouse as /devices/platform/i8042/serio1/input/input3
> md: Autodetecting RAID arrays.
> md: Scanned 8 and added 8 devices.
> md: autorun ...
> md: considering hdc4 ...
> md: adding hdc4 ...
> md: hdc3 has different UUID to hdc4
> md: hdc2 has different UUID to hdc4
> md: hdc1 has different UUID to hdc4
> md: adding hda4 ...
> md: hda3 has different UUID to hdc4
> md: hda2 has different UUID to hdc4
> md: hda1 has different UUID to hdc4
> md: created md4
> md: bind<hda4>
> md: bind<hdc4>
> md: running: <hdc4><hda4>
> raid1: raid set md4 active with 2 out of 2 mirrors
> md4: bitmap initialized from disk: read 11/11 pages, set 6 bits
> created bitmap (169 pages) for device md4
> md: considering hdc3 ...
> md: adding hdc3 ...
> md: hdc2 has different UUID to hdc3
> md: hdc1 has different UUID to hdc3
> md: adding hda3 ...
> md: hda2 has different UUID to hdc3
> md: hda1 has different UUID to hdc3
> md: created md3
> md: bind<hda3>
> md: bind<hdc3>
> md: running: <hdc3><hda3>
> raid1: raid set md3 active with 2 out of 2 mirrors
> md3: bitmap initialized from disk: read 15/15 pages, set 0 bits
> created bitmap (233 pages) for device md3
> md: considering hdc2 ...
> md: adding hdc2 ...
> md: hdc1 has different UUID to hdc2
> md: adding hda2 ...
> md: hda1 has different UUID to hdc2
> md: created md2
> md: bind<hda2>
> md: bind<hdc2>
> md: running: <hdc2><hda2>
> raid1: raid set md2 active with 2 out of 2 mirrors
> md2: bitmap initialized from disk: read 8/8 pages, set 0 bits
> created bitmap (123 pages) for device md2
> md: considering hdc1 ...
> md: adding hdc1 ...
> md: adding hda1 ...
> md: created md1
> md: bind<hda1>
> md: bind<hdc1>
> md: running: <hdc1><hda1>
> raid1: raid set md1 active with 2 out of 2 mirrors
> md1: bitmap initialized from disk: read 10/10 pages, set 0 bits
> created bitmap (153 pages) for device md1
> md: ... autorun DONE.
> EXT3-fs: INFO: recovery required on readonly filesystem.
> EXT3-fs: write access will be enabled during recovery.
> kjournald starting. Commit interval 5 seconds
> EXT3-fs: recovery complete.
> EXT3-fs: mounted filesystem with ordered data mode.
> VFS: Mounted root (ext3 filesystem) readonly.
> Freeing unused kernel memory: 264k freed
> EXT3 FS on md4, internal journal
> kjournald starting. Commit interval 5 seconds
> EXT3 FS on md3, internal journal
> EXT3-fs: mounted filesystem with ordered data mode.
> Adding 1999992k swap on /dev/md2. Priority:-1 extents:1 across:1999992k
> eth0: link up, 100Mbps, full-duplex, lpa 0xC5E1
> eth1: link up, 100Mbps, full-duplex, lpa 0x45E1
> eth0: no IPv6 routers present
> eth1: no IPv6 routers present
> BUG: unable to handle kernel NULL pointer dereference at virtual address 00000004
> printing eip: c0383fa0 *pde = 00000000
> Oops: 0000 [#1]
> CPU: 0
> EIP: 0060:[<c0383fa0>] Not tainted VLI
> EFLAGS: 00010282 (2.6.23-g4fa4d23f #4)
> EIP is at sk_filter_delayed_uncharge+0x0/0x20
> eax: c5dfb600 ebx: 00000000 ecx: 00000000 edx: 00000000
> esi: c5dfb600 edi: 00000000 ebp: c170d300 esp: c5dcbef8
> ds: 007b es: 007b fs: 0000 gs: 0033 ss: 0068
> Process dhcpd (pid: 5380, ti=c5dca000 task=c47f0520 task.ti=c5dca000)
> Stack: c038410f 00000068 00000058 c5dcbf34 b7fd000b c1b75000 c5dfb600 c0371d19
> c1b70fd8 c180d300 c1b70f80 00000007 00000001 b7fd000b c170d900 b7fd000b
> 080c9fa0 0000000e 00000000 c5dcbf6c c036dbc2 0000000e c1b75000 00000008
> Call Trace:
> [<c038410f>] sk_attach_filter+0xdf/0x100
> [<c0371d19>] sock_setsockopt+0x509/0x590
> [<c036dbc2>] sockfd_lookup_light+0x32/0x60
> [<c036dd8b>] sys_setsockopt+0x9b/0xb0
> [<c036f705>] sys_socketcall+0xd5/0x280
> [<c010503e>] sysenter_past_esp+0x5f/0x85
> =======================
> Code: cb 04 76 c7 83 c1 01 83 ee 01 39 d1 75 8d eb d7 83 7c cb 04 0f 77 b4 83 c1 01 83 ee 01 39 d1 0f 85 76 ff ff ff eb c0 8d 74 26 00 <8b> 4a 04 8d 0c cd 10 00 00 00 29 48 5c 8d 42 08 ba 10 40 38 c0
> EIP: [<c0383fa0>] sk_filter_delayed_uncharge+0x0/0x20 SS:ESP 0068:c5dcbef8
>
>
>
--
Jiri Kosina
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox