Re: [patch 0/6] pasemi_mac updates for 2.6.26
Olof Johansson wrote: On Tue, Feb 26, 2008 at 08:49:58PM +1100, Paul Mackerras wrote: Olof Johansson writes: Here's a set of updates for pasemi_mac for 2.6.26. Some of them touch the dma_lib in the platform code as well, but it's easier if it's all merged through netdev to avoid dependencies. Major highlights are jumbo frame support and ethtool basics, the rest is mostly minor plumbing around it. What route do you think these should take upstream? I'm happy to take them if Jeff is OK with that. I've sent them through Jeff in the past, that's been convenient when there's been churn in the network APIs. I'm not sure if there's much of that for .26 though. If Jeff prefers to ACK, I'll just add it to my git and ask you to pull that. But I was originally planning to just feed it through him. (Note: I'll repost the patch set later today or tomorrow with a couple of tweaks). Not much networking churn for 2.6.26, and IMO this patchset have above-average ppc changes/dependencies, so ACK -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RFC] ethtool netlink interface
Thomas Graf wrote: Hello, Before I continue to finish this work I'd like to get a few comments on my implementation attempt. The following patch implements the ETHTOOL_SSET and ETHTOOL_GSET command via netlink. The individual commands are implemented as separate functions and hooked into a table holding a validate, set and fill function for each command. Additionaly an entry must be made in the attribute policy to validate attributes when received. Each ethtool command bundle is stored as a nested attribute in the regular link netlink message, therefore, unlike the ioctl interface, multiple ethtool commands can be issued in the same message allowing for links to be fully configured with a single message. There is one big disadvantage: Due to the nature of ioctl it is basically not possible to share any code between the ioctl and neltink implementation therefore it implies duplicating code unless we want to do the same hack as fib fronted by constructing netlink messages inside the kernel. No objections, and it certainly makes sense that you would need a separate thunking layer to unwrap ethtool-nl msgs rather than handling an ioctl. However, I would think it inconsistent to only do SSET/GSET. If others are OK with this patch, are you open to implementing the full set of ethtool operations? Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] de2104x: remove BUG_ON() when changing media type
Ondrej Zary wrote: When the chip dies (probably because of a bug somewhere in the driver), de_stop_rxtx() fails and changing the media type crashes the whole machine. Replace BUG_ON() in de_set_media() with a warning. Signed-off-by: Ondrej Zary [EMAIL PROTECTED] --- linux-2.6.24-orig/drivers/net/tulip/de2104x.c 2008-02-25 18:27:34.0 +0100 +++ linux-2.6.24-pentium/drivers/net/tulip/de2104x.c2008-02-25 18:34:56.0 +0100 @@ -910,7 +910,8 @@ unsigned media = de-media_type; u32 macmode = dr32(MacMode); - BUG_ON(de_is_running(de)); + if (de_is_running(de)) + printk(KERN_WARNING %s: chip is running while changing media!\n, de-dev-name); Certainly a sane improvement... -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Divy Le Ray wrote: From: Divy Le Ray [EMAIL PROTECTED] Date: Wed, 20 Feb 2008 21:57:08 -0800 The driver is cxgb3 here, it uses LLTX. That's extremely unfortunate, hopefully you can update it to use a model like tg3 and others use. LLTX is a lost cause for hardware device drivers, and in fact we'd like to remove it tree wide eventually. It sounds like I messed up. cxgb3 does not use LLTX - The Chelsio driver does, thus should be converted. So, it sounds like Krishna's patch is ok, because the race does not exist anymore in this driver? Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Marin Mitov wrote: On Tuesday 26 February 2008 12:59:04 am you wrote: Divy Le Ray wrote: From: Divy Le Ray [EMAIL PROTECTED] Date: Wed, 20 Feb 2008 21:57:08 -0800 The driver is cxgb3 here, it uses LLTX. That's extremely unfortunate, hopefully you can update it to use a model like tg3 and others use. LLTX is a lost cause for hardware device drivers, and in fact we'd like to remove it tree wide eventually. Just for info: loopback.c uses it too :-) Yes, we're all aware of this. Google for david miller loopback lltx for a few examples... Also, please do not strip CC's, that's quite annoying. Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Divy Le Ray wrote: So, it sounds like Krishna's patch is ok, because the race does not exist anymore in this driver? The first part is right indeed, but the second part is breaking the current usage of txq_stopped and the logic that stops and restarts the Tx queue. I can submit a patch fixing it. Plese let me know what's more convenient for you. At this point, yes a fix (with a good patch description) would be preferred... Thanks, Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Compex FreedomLine 32 PnP-PCI2 broken with de2104x
Grant Grundler wrote: ISTR there was a time when tulip would compete with de4x5 for devices. tulip is the preferred driver. That's clearly no longer the case and perhaps both distro's need to revisit this. The only reason why de4x5 still exists is that the /tulip/ driver fails to work on a few chips like the 21142 (43?) shipped in various alpha boxen. de4x5 needs to go away, it's been unmaintained for ages, doesn't support any of the new hotplug APIs. de2104x is a work in progress. That's why it's marked EXPERIMENTAL in the Kconfig file. It's not a work in progress, it works just fine for most people (the few that are left). Last I heard, there was a problem with non-twisted-pair stuff, but that's about it. 'experimental' is generally a poorly maintained marker. Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Compex FreedomLine 32 PnP-PCI2 broken with de2104x
Grant Grundler wrote: On Mon, Feb 18, 2008 at 05:40:42PM +0100, Ondrej Zary wrote: I think that de2104x driver should be removed (or at least its MODULE_DEVICE_TABLE) and MODULE_DEVICE_TABLE with only 21040 and 21041 PCI IDs added to de4x5. I can send a patch if this is acceptable. It's acceptable to me. Jeff? (jgarzik) NAK, sorry, for two reasons: 1) we don't delete otherwise clean, working drivers simply because of a bug triggered by unplugging a cable. 2) de4x5 needs to go away. Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] [PS3] gelic wireless driver needs MAC80211 support
Sebastian Siewior wrote: so select it. Signed-off-by: Sebastian Siewior [EMAIL PROTECTED] --- drivers/net/Kconfig |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index f337800..a116056 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2363,6 +2363,7 @@ config GELIC_NET config GELIC_WIRELESS bool PS3 Wireless support depends on GELIC_NET + select MAC80211 Given that this is straying clearly into wireless territory, I think the linux-wireless folks and John Linville (wireless maintainer) are appropriate patch targets. Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2.6.25 2/4]S2io: Multiqueue network device support - FIFO selection based on L4 ports
David Miller wrote: From: Patrick McHardy [EMAIL PROTECTED] Date: Thu, 21 Feb 2008 00:08:52 +0100 Ramkrishna Vepa wrote: Sreenivasa Honnur wrote: - Resubmit #2 - Transmit fifo selection based on TCP/UDP ports. - Added tx_steering_type loadable parameter for transmit fifo selection. 0x0 NO_STEERING: Default FIFO is selected. 0x1 TX_PRIORITY_STEERING: FIFO is selected based on skb-priority. 0x2 TX_DEFAULT_STEERING: FIFO is selected based on L4 Ports. Why duplicate the generic multiqueue classification? [Ram] Could you be more specific? The generic multiqueue support classifies packets by setting skb-queue_mapping using qdisc classifiers, which is more flexible and avoids using module parameters. But it doesn't do what these multiqueue TX queue hardware devices want. These devices don't want packet scheduler classification, they want load balancing using some key (current cpu number, hashing on the packet headers, etc.) And that's not what our packet scheduler classifiers do or should do. We don't want to have to tell people you have to run 'tc' magic foo to use all of the TX queues on your network card. That's completely unreasonable and stupid. We have to resolve this somehow, and there have been many discussions about this a month or so ago. So where does that leave this patch? :) Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2]via-rhine.c: Use-register-offset-definition-for-WOLcgClr
Laura Garcia wrote: Use register offset definition for WOLcgClr. This patch does not change the driver behaviour. Signed-off-by: Laura Garcia Liebana [EMAIL PROTECTED] modified: drivers/net/via-rhine.c --- drivers/net/via-rhine.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) applied, after making the following manual edits: - removed modified: ... line, that is redundant to the diffstat, and being before the --- separator, it is included in the changelog by automated tools - removed all the silly dashes from the subject line. we want something readable, not a filename. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] sky2: fix LED management
Stephen Hemminger wrote: Fix problems in LED management, so ethtool -p works correctly on Yukon-EC and other chips. The driver was incorrectly setting the PHY LED overide bits. Moral: read the spec sheet, not the vendor driver. Signed-off-by: Stephen Hemminger [EMAIL PROTECTED] --- drivers/net/sky2.c | 99 + drivers/net/sky2.h | 21 +-- 2 files changed, 44 insertions(+), 76 deletions(-) applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 7/7] e1000e: remove unused read value in ASPM disable code.
Auke Kok wrote:
Signed-off-by: Auke Kok [EMAIL PROTECTED]
---
drivers/net/e1000e/netdev.c |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 7824bc2..fc5c63f 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -3490,7 +3490,6 @@ static int e1000_suspend(struct pci_dev *pdev,
pm_message_t state)
static void e1000e_disable_l1aspm(struct pci_dev *pdev)
{
int pos;
- u32 cap;
u16 val;
/*
@@ -3505,7 +3504,6 @@ static void e1000e_disable_l1aspm(struct pci_dev *pdev)
* active.
*/
pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);
- pci_read_config_dword(pdev, pos + PCI_EXP_LNKCAP, cap);
pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, val);
if (val 0x2) {
applied 1-7
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver fixes
David Miller wrote: Jeff, I really don't want to pull that tree in. Please trust me as your upstream to handle merging issues, as needed. I trust you... Otherwise I wouldn't have volunteered to move my upstream from Linus to you :) My main issues/motivations were: * quite simply, just force of habit: I'm used to basing off of a recent Linus tree, to guarantee buildboot testing against the latest. * worry about testing against a too-old tree, where non-networking fixes may have a relevant impact on my to-be-pushed netdrvr fixes. But in this case it's fair to say there are no such issues, and it was mainly just out of habit. So (as you saw in last email)... rebased and resend. Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ehea: add kdump support
Thomas Klein wrote: This patch adds kdump support to the ehea driver. As the firmware doesn't free resource handles automatically, the driver has to run an as simple as possible free resource function in case of a crash shutdown. The function iterates over two arrays freeing all resource handles which are stored there. The arrays are kept up-to-date during normal runtime. The crash handler fn is triggered by the recently introduced PPC crash shutdown reg/unreg functions. Signed-off-by: Thomas Klein [EMAIL PROTECTED] --- drivers/net/ehea/ehea.h | 34 +- drivers/net/ehea/ehea_main.c | 281 ++ 2 files changed, 290 insertions(+), 25 deletions(-) applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] fs_enet: Don't call phy_mii_ioctl() in atomic context.
Scott Wood wrote: The lock acquisition in fs_ioctl() does not appear to actually be necessary, and thus is simply removed. Signed-off-by: Scott Wood [EMAIL PROTECTED] --- This fixes the following bug: http://ozlabs.org/pipermail/linuxppc-dev/2008-February/051564.html drivers/net/fs_enet/fs_enet-main.c |7 +-- 1 files changed, 1 insertions(+), 6 deletions(-) applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] igb: fix legacy mode irq issue
Auke Kok wrote: From: Andy Gospodarek [EMAIL PROTECTED] I booted an igb kernel with the option pci=nomsi and instantly noticed that interrupts no longer worked on my igb device. I took a look at the interrupt initialization and quickly discovered a comment stating: DO NOT USE EIAME or IAME in legacy mode It seemed a bit odd that bits to enable IAM were being set in legacy interrupt mode, so I dropped out the following parts and interrupts began working fine again. [Updated code flow and a nitpick spelling error --Auke] Signed-off-by: Andy Gospodarek [EMAIL PROTECTED] Signed-off-by: Auke Kok [EMAIL PROTECTED] applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] update TULIP MAINTAINERS
Grant Grundler wrote: Jeff, Kyle and I are co-maintaining tulip driver. Normally kyle will review my patchs and submit them. I'll deal with bugzilla.kernel.org bugs and try to resolve those bugs. thanks, grant Signed-off-by: Grant Grundler [EMAIL PROTECTED] applied this and the uli patch -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH resend] virtio_net: Fix oops on early interrupts - introduced by virtio reset code
Christian Borntraeger wrote:
Am Montag, 11. Februar 2008 schrieb Anthony Liguori:
The reset support is in Linus's tree so we should try to push it for -rc2.
You are right. My repository was borked. will push it to Jeff Garzik. Thanks
Jeff can you schedule this fix into your network driver updates? Thanks
---
With the latest virtio_reset patches I got the following oops:
Unable to handle kernel pointer dereference at virtual kernel address
Oops: 0004 [#1] PREEMPT SMP
Modules linked in:
CPU: 1 Not tainted 2.6.24zlive-guest-10577-g63f5307-dirty #168
Process swapper (pid: 0, task: 0f866040, ksp: 0f86fd78)
Krnl PSW : 040410018000 0047598a (skb_recv_done+0x52/0x98)
R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:0 CC:1 PM:0 EA:3
Krnl GPRS: 0001 0efd0e60 0001
0f866040
008de4c8 1237 1237 0f977dd8
0020 001132bc 0f977e08 0f977dd8
Krnl Code: 0047597c: e3104034 lg %r1,48(%r4)
00475982: b9040001 lgr %r0,%r1
00475986: b9810003 ogr %r0,%r3
0047598a: eb1040300030 csg %r1,%r0,48(%r4)
00475990: a744fff9 brc 4,475982
00475994: a7110001 tmll%r1,1
00475998: a7840009 brc 8,4759aa
0047599c: e340b0b80004 lg %r4,184(%r11)
Call Trace:
([01500f978000] 0x1500f978000)
[004779a6] vring_interrupt+0x72/0x88
[00491d9c] kvm_extint_handler+0x34/0x44
[0010d2d4] do_extint+0xc0/0xfc
[00113b5a] ext_no_vtime+0x1c/0x20
[0010a0b6] cpu_idle+0x21a/0x230
([0010a096] cpu_idle+0x1fa/0x230)
[0057dfe4] start_secondary+0xa0/0xb4
We must initialize vdev-priv before we use the notify hypercall as
vdev-priv is used in skb_recv_done. So lets move the assignment of
vdev-priv before we call try_fill_recv.
Signed-off-by: Christian Borntraeger [EMAIL PROTECTED]
Acked-by: Anthony Liguori [EMAIL PROTECTED]
---
drivers/net/virtio_net.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
applied
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 1/1] claw: make use of DIV_ROUND_UP
applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] tlan: add static to function definitions
Harvey Harrison wrote: The forward declarations were already marked static, make the definitions be static as well. Fixes the sparse warnings as well. drivers/net/tlan.c:1403:5: warning: symbol 'TLan_HandleInvalid' was not declared. Should it be static? drivers/net/tlan.c:1435:5: warning: symbol 'TLan_HandleTxEOF' was not declared. Should it be static? drivers/net/tlan.c:1521:5: warning: symbol 'TLan_HandleStatOverflow' was not declared. Should it be static? drivers/net/tlan.c:1557:5: warning: symbol 'TLan_HandleRxEOF' was not declared. Should it be static? drivers/net/tlan.c:1692:5: warning: symbol 'TLan_HandleDummy' was not declared. Should it be static? drivers/net/tlan.c:1722:5: warning: symbol 'TLan_HandleTxEOC' was not declared. Should it be static? drivers/net/tlan.c:1770:5: warning: symbol 'TLan_HandleStatusCheck' was not declared. Should it be static? drivers/net/tlan.c:1845:5: warning: symbol 'TLan_HandleRxEOC' was not declared. Should it be static? drivers/net/tlan.c:1905:6: warning: symbol 'TLan_Timer' was not declared. Should it be static? drivers/net/tlan.c:1986:6: warning: symbol 'TLan_ResetLists' was not declared. Should it be static? drivers/net/tlan.c:2046:6: warning: symbol 'TLan_FreeLists' was not declared. Should it be static? drivers/net/tlan.c:2095:6: warning: symbol 'TLan_PrintDio' was not declared. Should it be static? drivers/net/tlan.c:2130:6: warning: symbol 'TLan_PrintList' was not declared. Should it be static? drivers/net/tlan.c:2166:6: warning: symbol 'TLan_ReadAndClearStats' was not declared. Should it be static? drivers/net/tlan.c:2242:1: warning: symbol 'TLan_ResetAdapter' was not declared. Should it be static? drivers/net/tlan.c:2328:1: warning: symbol 'TLan_FinishReset' was not declared. Should it be static? drivers/net/tlan.c:2451:6: warning: symbol 'TLan_SetMac' was not declared. Should it be static? drivers/net/tlan.c:2493:6: warning: symbol 'TLan_PhyPrint' was not declared. Should it be static? drivers/net/tlan.c:2542:6: warning: symbol 'TLan_PhyDetect' was not declared. Should it be static? drivers/net/tlan.c:2589:6: warning: symbol 'TLan_PhyPowerDown' was not declared. Should it be static? drivers/net/tlan.c:2614:6: warning: symbol 'TLan_PhyPowerUp' was not declared. Should it be static? drivers/net/tlan.c:2635:6: warning: symbol 'TLan_PhyReset' was not declared. Should it be static? drivers/net/tlan.c:2663:6: warning: symbol 'TLan_PhyStartLink' was not declared. Should it be static? drivers/net/tlan.c:2750:6: warning: symbol 'TLan_PhyFinishAutoNeg' was not declared. Should it be static? drivers/net/tlan.c:2906:5: warning: symbol 'TLan_MiiReadReg' was not declared. Should it be static? drivers/net/tlan.c:2996:6: warning: symbol 'TLan_MiiSendData' was not declared. Should it be static? drivers/net/tlan.c:3038:6: warning: symbol 'TLan_MiiSync' was not declared. Should it be static? drivers/net/tlan.c:3077:6: warning: symbol 'TLan_MiiWriteReg' was not declared. Should it be static? drivers/net/tlan.c:3147:6: warning: symbol 'TLan_EeSendStart' was not declared. Should it be static? drivers/net/tlan.c:3187:5: warning: symbol 'TLan_EeSendByte' was not declared. Should it be static? drivers/net/tlan.c:3248:6: warning: symbol 'TLan_EeReceiveByte' was not declared. Should it be static? drivers/net/tlan.c:3306:5: warning: symbol 'TLan_EeReadByte' was not declared. Should it be static? Signed-off-by: Harvey Harrison [EMAIL PROTECTED] --- Kept the style consistent with the rest of the file, checkpatch will complain. drivers/net/tlan.c | 64 ++-- 1 files changed, 32 insertions(+), 32 deletions(-) applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/1] sis190: read the mac address from the eeprom first
Francois Romieu wrote: Reading a serie of zero from the cmos sram area do not work well with is_valid_ether_addr(). Let's read the mac address from the eeprom first as it seems more reliable. Fix for http://bugzilla.kernel.org/show_bug.cgi?id=9831 Signed-off-by: Francois Romieu [EMAIL PROTECTED] --- drivers/net/sis190.c | 15 ++- 1 files changed, 10 insertions(+), 5 deletions(-) applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2.6.25] gianfar: don't pass NULL dev ptr to DMA ops
Andy Fleming wrote: From: Becky Bruce [EMAIL PROTECTED] Change all dma op invocations in gianfar.c to actually pass in the device pointer. Currently, the value is ignored, but it will be used going forward as we implement archdata for 32-bit powerpc. Signed-off-by: Becky Bruce [EMAIL PROTECTED] Acked-by: Andy Fleming [EMAIL PROTECTED] --- drivers/net/gianfar.c | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] igb: Fix panic with NICs with 1000BASE-SX PHY
Auke Kok wrote: From: Bill Hayes [EMAIL PROTECTED] This patch eliminates a kernel panic with the igb driver in 2.6.25-rc2 when running on a Intel 82575 Ethernet controller with a 1000BASE-SX PHY. The panic does not happen with the 1000BASE-T PHY, only with a SX connection. Signed-off-by: Bill Hayes [EMAIL PROTECTED] Signed-off-by: Andy Gospodarek [EMAIL PROTECTED] Signed-off-by: Auke Kok [EMAIL PROTECTED] applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [2.6 patch] net/phy/mdio_bus.c: fix a check-after-use
Adrian Bunk wrote: This patch fixes a check-after-use spotted by the Coverity checker. Signed-off-by: Adrian Bunk [EMAIL PROTECTED] --- 6beeb3ac577d74d72b2f91bd654eecb904c3c17e diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 6e9f619..963630c 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -49,13 +49,13 @@ int mdiobus_register(struct mii_bus *bus) int i; int err = 0; - mutex_init(bus-mdio_lock); - if (NULL == bus || NULL == bus-name || NULL == bus-read || NULL == bus-write) return -EINVAL; + mutex_init(bus-mdio_lock); + applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[git patches] net driver fixes
Note: this is based off of Linus's latest commit
(5d9c4a7de64d398604a978d267a6987f1f4025b7), since all my previous
submissions are now upstream (thanks!).
Please pull from 'upstream-davem' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
upstream-davem
to receive the following updates:
MAINTAINERS| 11 +-
drivers/net/cs89x0.c | 12 +-
drivers/net/ehea/ehea.h| 34 +-
drivers/net/ehea/ehea_main.c | 281 +---
drivers/net/fs_enet/fs_enet-main.c |7 +-
drivers/net/gianfar.c | 14 +-
drivers/net/igb/igb_main.c | 15 +--
drivers/net/pcmcia/pcnet_cs.c | 10 +-
drivers/net/phy/mdio_bus.c |4 +-
drivers/net/sis190.c | 15 ++-
drivers/net/tlan.c | 64
drivers/net/tulip/uli526x.c| 12 ++-
drivers/net/virtio_net.c |2 +-
drivers/s390/net/claw.c| 39 +++---
14 files changed, 399 insertions(+), 121 deletions(-)
Adrian Bunk (1):
net/phy/mdio_bus.c: fix a check-after-use
Andy Gospodarek (1):
igb: fix legacy mode irq issue
Becky Bruce (1):
gianfar: don't pass NULL dev ptr to DMA ops
Bill Hayes (1):
igb: Fix panic with NICs with 1000BASE-SX PHY
Christian Borntraeger (1):
virtio_net: Fix oops on early interrupts - introduced by virtio reset code
Francois Romieu (1):
sis190: read the mac address from the eeprom first
Grant Grundler (2):
update TULIP MAINTAINERS
uli526x partially recognizing interface
Harvey Harrison (1):
tlan: add static to function definitions
Julia Lawall (1):
claw: make use of DIV_ROUND_UP
Komuro (1):
pcnet_cs: if AX88190-based card, printk use axnet_cs instead message.
Leonardo Potenza (1):
drivers/net/cs89x0.c: compilation warning fix
Scott Wood (1):
fs_enet: Don't call phy_mii_ioctl() in atomic context.
Thomas Klein (1):
ehea: add kdump support
diff --git a/MAINTAINERS b/MAINTAINERS
index 082d1ee..53b6e60 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3887,10 +3887,13 @@ M: [EMAIL PROTECTED]
L: [EMAIL PROTECTED]
S: Maintained
-TULIP NETWORK DRIVER
-L: [EMAIL PROTECTED]
-W: http://sourceforge.net/projects/tulip/
-S: Orphan
+TULIP NETWORK DRIVERS
+P: Grant Grundler
+M: [EMAIL PROTECTED]
+P: Kyle McMartin
+M: [EMAIL PROTECTED]
+L: netdev@vger.kernel.org
+S: Maintained
TUN/TAP driver
P: Maxim Krasnyansky
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 5717509..348371f 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -172,30 +172,30 @@ static char version[] __initdata =
them to system IRQ numbers. This mapping is card specific and is set to
the configuration of the Cirrus Eval board for this chip. */
#ifdef CONFIG_ARCH_CLPS7500
-static unsigned int netcard_portlist[] __initdata =
+static unsigned int netcard_portlist[] __used __initdata =
{ 0x80090303, 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260,
0x280, 0x2a0, 0x2c0, 0x2e0, 0};
static unsigned int cs8900_irq_map[] = {12,0,0,0};
#elif defined(CONFIG_SH_HICOSH4)
-static unsigned int netcard_portlist[] __initdata =
+static unsigned int netcard_portlist[] __used __initdata =
{ 0x0300, 0};
static unsigned int cs8900_irq_map[] = {1,0,0,0};
#elif defined(CONFIG_MACH_IXDP2351)
-static unsigned int netcard_portlist[] __initdata =
{IXDP2351_VIRT_CS8900_BASE, 0};
+static unsigned int netcard_portlist[] __used __initdata =
{IXDP2351_VIRT_CS8900_BASE, 0};
static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0};
#include asm/irq.h
#elif defined(CONFIG_ARCH_IXDP2X01)
#include asm/irq.h
-static unsigned int netcard_portlist[] __initdata =
{IXDP2X01_CS8900_VIRT_BASE, 0};
+static unsigned int netcard_portlist[] __used __initdata =
{IXDP2X01_CS8900_VIRT_BASE, 0};
static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};
#elif defined(CONFIG_ARCH_PNX010X)
#include asm/irq.h
#include asm/arch/gpio.h
#define CIRRUS_DEFAULT_BASEIO_ADDRESS(EXT_STATIC2_s0_BASE + 0x20)
/* = Physical address 0x4820 */
#define CIRRUS_DEFAULT_IRQ VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event
inputs bank 1 - ID 35/bit 3 */
-static unsigned int netcard_portlist[] __initdata = {CIRRUS_DEFAULT_BASE, 0};
+static unsigned int netcard_portlist[] __used __initdata =
{CIRRUS_DEFAULT_BASE, 0};
static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ, 0, 0, 0};
#else
-static unsigned int netcard_portlist[] __initdata =
+static unsigned int netcard_portlist[] __used __initdata =
{ 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0,
0x2c0, 0x2e0, 0};
static unsigned int cs8900_irq_map[] = {10,11,12,5};
#endif
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index 88fb53e..7c4ead3 100644
--- a/drivers/net/ehea/ehea.h
+++
Re: [git patches] net driver updates
Divy Le Ray wrote:
Jeff Garzik wrote:
Mostly fixes, a few cleanups (generally assisting fixes), and an
exception for PS3 wireless because it had been posted, reviewed and
acked for a while, just not committed.
Please pull from 'upstream-davem' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
upstream-davem
to receive the following updates:
drivers/net/cxgb3/sge.c | 35 +-
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 9ca8c66..979f3fc 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -1059,6 +1059,14 @@ static void write_tx_pkt_wr(struct adapter
*adap, struct sk_buff *skb,
htonl(V_WR_TID(q-token)));
}
+static inline void t3_stop_queue(struct net_device *dev, struct
sge_qset *qs,
+ struct sge_txq *q)
+{
+netif_stop_queue(dev);
+set_bit(TXQ_ETH, qs-txq_stopped);
+q-stops++;
+}
+
/**
*eth_xmit - add a packet to the Ethernet Tx queue
*@skb: the packet
@@ -1090,31 +1098,18 @@ int t3_eth_xmit(struct sk_buff *skb, struct
net_device *dev)
ndesc = calc_tx_descs(skb);
if (unlikely(credits ndesc)) {
-if (!netif_queue_stopped(dev)) {
-netif_stop_queue(dev);
-set_bit(TXQ_ETH, qs-txq_stopped);
-q-stops++;
-dev_err(adap-pdev-dev,
-%s: Tx ring %u full while queue awake!\n,
-dev-name, q-cntxt_id 7);
-}
+t3_stop_queue(dev, qs, q);
+dev_err(adap-pdev-dev,
+%s: Tx ring %u full while queue awake!\n,
+dev-name, q-cntxt_id 7);
spin_unlock(q-lock);
return NETDEV_TX_BUSY;
}
q-in_use += ndesc;
-if (unlikely(credits - ndesc q-stop_thres)) {
-q-stops++;
-netif_stop_queue(dev);
-set_bit(TXQ_ETH, qs-txq_stopped);
-#if !USE_GTS
-if (should_restart_tx(q)
-test_and_clear_bit(TXQ_ETH, qs-txq_stopped)) {
-q-restarts++;
-netif_wake_queue(dev);
-}
-#endif
-}
+if (unlikely(credits - ndesc q-stop_thres))
+if (USE_GTS || !should_restart_tx(q))
+t3_stop_queue(dev, qs, q);
gen = q-gen;
q-unacked += ndesc;
Hi Jeff,
I thought I had NAK'ed the patch modifying sge.c from Krishna Kumar.
Looking back at my answer at the time, I was obviously unclear.
Can you please revert the drivers/net/cxgb3sge.c change ?
Explain why, so I can include it in the changelog please...
Jeff
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ixgbe: Correctly obtain protocol information on transmit
Auke Kok wrote: In reply to RE: [Fwd: [PATCH 2.6.25] ixgbe/igb: correctly obtain protocol information on transmit] from Andy Gospodarek: The driver was incorrectly looking at socket headers for protocol information, needed for checksumming offload. Fix this by not looking at the socket but frame headers instead. This disregards extension headers but it's unclear that linux generates those anyway. Tested by Andy Gospodarek. Signed-off-by: Auke Kok [EMAIL PROTECTED] applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] e1000e: PCIe devices do not need to unset MANC_ARP_ENA
Auke Kok wrote: From: David Graham [EMAIL PROTECTED] Users reported that ARP's were lost with e1000e. The problem is fixed by not enabling this manageability configuration bit. None of the release_manageability code is actually needed as the normal device reset during a shutdown returns everthing to the right condition automatically. Signed-off-by: David Graham [EMAIL PROTECTED] Signed-off-by: Auke Kok [EMAIL PROTECTED] --- drivers/net/e1000e/netdev.c | 26 -- 1 files changed, 0 insertions(+), 26 deletions(-) applied 1-2 -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch] Fix station address detection in smc
Chuck Ebbert wrote: Megahertz EM1144 PCMCIA ethernet adapter needs special handling because it has two VERS_1 tuples and the station address is in the second one. Conversion to generic handling of these fields broke it. Reverting that fixes the device. https://bugzilla.redhat.com/show_bug.cgi?id=233255 Thanks go to Jon Stanley for not giving up on this one until the problem was found. Signed-off-by: Chuck Ebbert [EMAIL PROTECTED] --- This was broken for over a year before the problem was found... applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[git patches] net driver fixes
Process note: 'upstream-davem' continues the git history that began
the previous push. This sometimes happens when I continue to commit
locally, working in parallel while waiting for changes to hit Linus
upstream.
As current net-2.6.git appears to have the same commit ids that I
submitted in the previous push, this should be no problem at all,
just wanted you to know.
Please pull from 'upstream-davem' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
upstream-davem
to receive the following updates:
drivers/net/e1000/e1000_ethtool.c |2 +-
drivers/net/e1000/e1000_main.c|8
drivers/net/e1000e/netdev.c | 34 ++---
drivers/net/gianfar.c |4 +-
drivers/net/gianfar_mii.c |4 +-
drivers/net/hamradio/mkiss.c |5 +--
drivers/net/igb/igb_ethtool.c |2 +-
drivers/net/igb/igb_main.c| 28 --
drivers/net/ixgb/ixgb_ethtool.c |2 +-
drivers/net/ixgbe/ixgbe_main.c| 41 +
drivers/net/pcmcia/smc91c92_cs.c | 12 +-
drivers/net/tsi108_eth.c | 72 +---
12 files changed, 114 insertions(+), 100 deletions(-)
Al Viro (1):
gianfar iomem misannotations
Alex Bounine (5):
Tsi108_eth: add missing linking to driver data
Tsi108_eth: fix detection of 1000Mb mode
Tsi108_eth: remove not needed code
Tsi108_eth: fix link recovery after disconnect
Tsi108_eth: Add ethtool support
Auke Kok (7):
e1000: warn if this driver is used for e1000e devices
e1000e: Fix logic reversal keeping link active
ixgbe: warn when device is in a x4 or lower width slot
ixgbe: Disallow device reset during ethtool test
ixgbe: remove accidentally added #ifdef
e1000e: Fix CRC stripping in hardware context bug
ixgbe: Correctly obtain protocol information on transmit
Chuck Ebbert (1):
Fix station address detection in smc
David Graham (2):
igb: PCIe devices do not need to unset MANC_ARP_ENA
e1000e: PCIe devices do not need to unset MANC_ARP_ENA
Jarek Poplawski (1):
mkiss: ax_bump() locking fix
Julia Lawall (1):
replace code with FIELD_SIZEOF
diff --git a/drivers/net/e1000/e1000_ethtool.c
b/drivers/net/e1000/e1000_ethtool.c
index d876787..85e66f4 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -50,7 +50,7 @@ struct e1000_stats {
int stat_offset;
};
-#define E1000_STAT(m) sizeof(((struct e1000_adapter *)0)-m), \
+#define E1000_STAT(m) FIELD_SIZEOF(struct e1000_adapter, m), \
offsetof(struct e1000_adapter, m)
static const struct e1000_stats e1000_gstrings_stats[] = {
{ rx_packets, E1000_STAT(stats.gprc) },
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index d4ee8ec..0991648 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1195,6 +1195,14 @@ e1000_probe(struct pci_dev *pdev,
printk(%s\n, print_mac(mac, netdev-dev_addr));
+ if (adapter-hw.bus_type == e1000_bus_type_pci_express) {
+ DPRINTK(PROBE, WARNING, This device (id %04x:%04x) will no
+ longer be supported by this driver in the future.\n,
+ pdev-vendor, pdev-device);
+ DPRINTK(PROBE, WARNING, please use the \e1000e\
+ driver instead.\n);
+ }
+
/* reset the hardware with the new settings */
e1000_reset(adapter);
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index f58f017..3031d6d 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1055,23 +1055,6 @@ static void e1000_release_hw_control(struct
e1000_adapter *adapter)
}
}
-static void e1000_release_manageability(struct e1000_adapter *adapter)
-{
- if (adapter-flags FLAG_MNG_PT_ENABLED) {
- struct e1000_hw *hw = adapter-hw;
-
- u32 manc = er32(MANC);
-
- /* re-enable hardware interception of ARP */
- manc |= E1000_MANC_ARP_EN;
- manc = ~E1000_MANC_EN_MNG2HOST;
-
- /* don't explicitly have to mess with MANC2H since
-* MANC has an enable disable that gates MANC2H */
- ew32(MANC, manc);
- }
-}
-
/**
* @e1000_alloc_ring - allocate memory for a ring structure
**/
@@ -1561,9 +1544,6 @@ static void e1000_init_manageability(struct e1000_adapter
*adapter)
manc = er32(MANC);
- /* disable hardware interception of ARP */
- manc = ~(E1000_MANC_ARP_EN);
-
/* enable receiving management packets to the host. this will probably
* generate destination unreachable messages from the host OS, but
* the packets will be handled on SMBUS */
@@ -1690,6 +1670,9 @@ static void e1000_setup_rctl(struct e1000_adapter
*adapter)
else
Re: [PATCH] e1000e: Fix CRC stripping in hardware context bug
Auke Kok wrote: CRC stripping was only correctly enabled for packet split recieves which is used when receiving jumbo frames. Correctly enable SECRC also for normal buffer packet receives. Tested by Andy Gospodarek and Johan Andersson, see bugzilla #9940. Signed-off-by: Auke Kok [EMAIL PROTECTED] --- drivers/net/e1000e/netdev.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2.6.25] igb: fix legacy mode irq issue
Andy Gospodarek wrote: I booted an igb kernel with the option pci=nomsi and instantly noticed that interrupts no longer worked on my igb device. I took a look at the interrupt initialization and quickly discovered a comment stating: DO NOT USE EIAME or IAME in legacy mode It seemed a bit odd that bits to enable IAM were being set in legacy interrupt mode, so I dropped out the following parts and interrupts began working fine again. Signed-off-by: Andy Gospodarek [EMAIL PROTECTED] --- igb_main.c |3 --- 1 files changed, 3 deletions(-) diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index f3c144d..be5da09 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -472,9 +471,6 @@ static int igb_request_irq(struct igb_adapter *adapter) goto request_done; } - /* enable IAM, auto-mask */ - wr32(E1000_IAM, IMS_ENABLE_MASK); - ACK from Auke? (apologies if I missed it...) -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH][AX25] mkiss: ax_bump() locking fix
Jarek Poplawski wrote: Hi, This is unchanged patch previously sent here for testing. I think it should be applied. Thanks, Jarek P. Subject: [PATCH][AX25] mkiss: ax_bump() locking fix According to one of OOPSes reported by Jann softirq can break while skb is prepared for netif_rx. The report isn't complete, so the real reason of the later bug could be different, but IMHO this locking break in ax_bump is unsafe and unnecessary. Reported-and-tested-by: Jann Traschewski [EMAIL PROTECTED] Signed-off-by: Jarek Poplawski [EMAIL PROTECTED] --- drivers/net/hamradio/mkiss.c |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver fixes
David Miller wrote: From: Jeff Garzik [EMAIL PROTECTED] Date: Fri, 15 Feb 2008 11:03:14 -0500 Please pull from 'upstream-davem' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-davem Pulled and pushed out. As I mentioned to John Linville just now, I'm going to try and keep net-2.6 running as long as I can without rebasing. So you can just keep piling patches into your upstream-davem branch without fear of my turning your world upside down with a rebase :-) Thanks, it's appreciated! Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RFC] sky2: don't request unused i/o region
Stephen Hemminger wrote:
The sky2 driver only uses the PCI memory region (0) not the
available I/O region. Some users want to use lots of boards, and the
I/O space gets exhausted.
Signed-off-by: Stephen Hemminger [EMAIL PROTECTED]
--- a/drivers/net/sky2.c2008-02-13 18:58:21.0 -0800
+++ b/drivers/net/sky2.c2008-02-13 18:58:55.0 -0800
@@ -4135,9 +4135,9 @@ static int __devinit sky2_probe(struct p
goto err_out;
}
- err = pci_request_regions(pdev, DRV_NAME);
+ err = pci_request_region(pdev, 0, DRV_NAME);
if (err) {
- dev_err(pdev-dev, cannot obtain PCI resources\n);
+ dev_err(pdev-dev, cannot obtain PCI resource\n);
Your description of the problem does not match the fix.
PCI resources are already allocated to the device (or not) by this point
in the code. pci_request_region/regions is purely internal kernel
software resource reservation -- protecting drivers from themselves, and
arguably not really needed anymore on modern buses.
Thus, I cannot see how this patch can possibly exhaust I/O space --
the relevant PCI resources are allocated to the device, or not,
regardless of these function calls.
As long as there is no resource conflict, you can have 1 million boards
and still use pci_request_regions().
Jeff
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Ben Dooks wrote: These two where meant to be from Laurent Pinchart, they do have the correct signed-off lines in for him and start with Patch from:. Is there any chance of fixing the authour attribution now? The first line of the changeset mentions it. Other than that, nope. Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Bug 9750] [patch 2.6.25] dev: avoid a race that triggers assertion failure
Matti Linnanvuori wrote: From: Matti Linnanvuori [EMAIL PROTECTED] There is a race in Linux kernel file net/core/dev.c, function dev_close. The function calls function dev_deactivate, which calls function dev_watchdog_down that deletes the watchdog timer. However, after that, a driver can call netif_carrier_ok, which calls function __netdev_watchdog_up that can add the watchdog timer again. Function unregister_netdevice calls function dev_shutdown that traps the bug !timer_pending(dev-watchdog_timer). Moving dev_deactivate after netif_running() has been cleared prevents function netif_carrier_on from calling __netdev_watchdog_up and adding the watchdog timer again. Signed-off-by: Matti Linnanvuori [EMAIL PROTECTED] --- --- linux-2.6.25/net/core/dev.c2008-02-12 12:37:51.206833000 +0200 +++ b/net/core/dev.c2008-02-12 12:38:48.727611400 +0200 @@ -1071,8 +1071,6 @@ int dev_close(struct net_device *dev) */ call_netdevice_notifiers(NETDEV_GOING_DOWN, dev); -dev_deactivate(dev); - clear_bit(__LINK_STATE_START, dev-state); /* Synchronize to scheduled poll. We cannot touch poll list, @@ -1083,6 +1081,7 @@ int dev_close(struct net_device *dev) */ smp_mb__after_clear_bit(); /* Commit netif_running(). */ +dev_deactivate(dev); /* *Call the device specific close. This cannot fail. *Only if device is UP This is more for davem (he does net/* stuff) Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/5 v3] Tsi108_eth: remove not needed code
Alex Bounine wrote: Code clean-up for tsi108_eth network driver. This patch removes not needed dummy read and the corresponding comment. The PHY logic requires two reads from the status register to get current link status. This is done correctly inside mii_check_media(). Signed-off-by: Alexandre Bounine [EMAIL PROTECTED] --- diff -pNur linux-2.6.24/drivers/net/tsi108_eth.c linux-2.6.24-fix/drivers/net/tsi108_eth.c --- linux-2.6.24/drivers/net/tsi108_eth.c 2008-02-06 15:47:35.0 -0500 +++ linux-2.6.24-fix/drivers/net/tsi108_eth.c 2008-02-06 15:54:14.0 -0500 @@ -297,18 +297,11 @@ static void tsi108_check_phy(struct net_ u32 speed; unsigned long flags; - /* Do a dummy read, as for some reason the first read -* after a link becomes up returns link down, even if -* it's been a while since the link came up. -*/ - spin_lock_irqsave(phy_lock, flags); if (!data-phy_ok) goto out; - tsi108_read_mii(data, MII_BMSR); - duplex = mii_check_media(data-mii_if, netif_msg_link(data), data-init_media); applied all five, but each one was still corrupted according to git-am. I was able to apply four via patch(1), which is more forgiving, but there are still email problems. As as you can see from the above quoted (last) line, your email client is still word-wrapping patches. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/5 v2] Tsi108_eth: add missing linking to driver data
Alexandre Bounine wrote: Bug fix for tsi108_eth network driver. This patch adds missing linking to driver data. Signed-off-by: Alexandre Bounine [EMAIL PROTECTED] --- diff -pNur linux-2.6.24/drivers/net/tsi108_eth.c linux-2.6.24-fix/drivers/net/tsi108_eth.c --- linux-2.6.24/drivers/net/tsi108_eth.c 2008-01-24 17:58:37.0 -0500 +++ linux-2.6.24-fix/drivers/net/tsi108_eth.c 2008-02-06 14:30:04.0 -0500 @@ -1629,6 +1629,7 @@ tsi108_init_one(struct platform_device * goto register_fail; } + platform_set_drvdata(pdev, dev); printk(KERN_INFO %s: Tsi108 Gigabit Ethernet, MAC: %s\n, dev-name, print_mac(mac, dev-dev_addr)); #ifdef DEBUG still getting word-wrapped... even the patch header is mangled across multiple lines -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/5] resend forcedeth: tx collision fix
Ayaz Abdulla wrote: This patch supports a new fix in hardware regarding tx collisions. In the cases where we are in autoneg mode and the link partner is in forced mode, we need to setup the tx deferral register differently in order to reduce collisions on the wire. Signed-off-by: Ayaz Abdulla [EMAIL PROTECTED] applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2.6.25] cxgb3: Handle ARP completions that mark neighbors stale.
Steve Wise wrote: cxgb3: Handle ARP completions that mark neighbors stale. When ARP completes due to a request rather than a reply the neighbor is marked NUD_STALE instead of reachable (see arp_process()). The handler for the resulting netevent needs to check also for NUD_STALE. Failure to use the arp entry can cause RDMA connection failures. Signed-off-by: Steve Wise [EMAIL PROTECTED] applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 1/3] drivers/s390/net: Kconfig brush up
applied 1-3 to #upstream (2.6.26) Even the initial revision was outside the merge window, so it was never going to make 2.6.25, thus I waited a bit for further comments and revisions -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 10/10] atl1: reduce forward declarations
applied 1-10 to #upstream (2.6.26) -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [2.6 patch] remove the obsolete xircom_tulip_cb driver
Adrian Bunk wrote: The xircom_tulip_cb driver has been replaced the xircom_cb driver, and since it depended on BROKEN_ON_SMP it e.g. was no longer present in many distribution kernels. This patch therefore removes it. Signed-off-by: Adrian Bunk [EMAIL PROTECTED] --- drivers/net/tulip/Kconfig | 15 drivers/net/tulip/Makefile |1 drivers/net/tulip/xircom_tulip_cb.c | 1726 3 files changed, 1 insertion(+), 1741 deletions(-) applied to #upstream (2.6.26) -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] sk98lin: remove obsolete driver
applied to #upstream (2.6.26) -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] tulip: hardware mitigation simplify
Stephen Hemminger wrote:
The hardware mitigation in tulip can be simpified.
1. The budget with new NAPI will always be less than RX_RING_SIZE
because RX_RING_SIZE is 128 and weight is 16.
2. The received counter is redundunt, just use the work_done value.
3. Only one value is used from the mit_table[]
Signed-off-by: Stephen Hemminger [EMAIL PROTECTED]
---
This can wait for 2.6.25
--- a/drivers/net/tulip/interrupt.c 2007-12-13 09:26:35.0 -0800
+++ b/drivers/net/tulip/interrupt.c 2007-12-13 09:27:29.0 -0800
@@ -21,45 +21,6 @@
int tulip_rx_copybreak;
unsigned int tulip_max_interrupt_work;
-#ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
-#define MIT_SIZE 15
-#define MIT_TABLE 15 /* We use 0 or max */
-
-static unsigned int mit_table[MIT_SIZE+1] =
-{
-/* CRS11 21143 hardware Mitigation Control Interrupt
-We use only RX mitigation we other techniques for
-TX intr. mitigation.
-
- 31Cycle Size (timer control)
- 30:27 TX timer in 16 * Cycle size
- 26:24 TX No pkts before Int.
- 23:20 RX timer in Cycle size
- 19:17 RX No pkts before Int.
- 16 Continues Mode (CM)
-*/
-
-0x0, /* IM disabled */
-0x8015, /* RX time = 1, RX pkts = 2, CM = 1 */
-0x8015,
-0x8027,
-0x8037,
-0x8049,
-0x8059,
-0x8069,
-0x807B,
-0x808B,
-0x809D,
-0x80AD,
-0x80BD,
-0x80CF,
-0x80DF,
-// 0x80FF /* RX time = 16, RX pkts = 7, CM = 1 */
-0x80F1 /* RX time = 16, RX pkts = 0, CM = 1 */
-};
-#endif
-
-
int tulip_refill_rx(struct net_device *dev)
{
struct tulip_private *tp = netdev_priv(dev);
@@ -113,21 +74,10 @@ int tulip_poll(struct napi_struct *napi,
struct net_device *dev = tp-dev;
int entry = tp-cur_rx % RX_RING_SIZE;
int work_done = 0;
-#ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
- int received = 0;
-#endif
if (!netif_running(dev))
goto done;
-#ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
-
-/* that one buffer is needed for mit activation; or might be a
- bug in the ring buffer code; check later -- JHS*/
-
-if (budget =RX_RING_SIZE) budget--;
-#endif
-
if (tulip_debug 4)
printk(KERN_DEBUG In tulip_rx(), entry %d %8.8x.\n, entry,
tp-rx_ring[entry].status);
@@ -239,9 +189,6 @@ int tulip_poll(struct napi_struct *napi,
tp-stats.rx_packets++;
tp-stats.rx_bytes += pkt_len;
}
-#ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
- received++;
-#endif
entry = (++tp-cur_rx) % RX_RING_SIZE;
if (tp-cur_rx - tp-dirty_rx RX_RING_SIZE/4)
@@ -279,14 +226,14 @@ done:
ON: More then 1 pkt received (per intr.) OR we are dropping
OFF: Only 1 pkt received
- Note. We only use min and max (0, 15) settings from mit_table */
-
+ Note. We only use max or min values for mit */
if( tp-flags HAS_INTR_MITIGATION) {
- if( received 1 ) {
+ if( work_done 1 ) {
if( ! tp-mit_on ) {
tp-mit_on = 1;
- iowrite32(mit_table[MIT_TABLE], tp-base_addr
+ CSR11);
+/* RX time = 16, RX pkts = 0, CM = 1 */
+ iowrite32(0x80F1, tp-base_addr + CSR11);
I think it's disappointing to eliminate mit_table[], because that can be
modified easily in the current setup
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/7] PS3: gelic: Fix the wrong dev_id passed
Masakazu Mokuno wrote: PS3: gelic: Fix the wrong dev_id passed The device id for lv1_net_set_interrupt_status_indicator() is wrong. This path would be invoked only in the case of an initialization failure. Signed-off-by: Masakazu Mokuno [EMAIL PROTECTED] --- drivers/net/ps3_gelic_net.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) applied 1-7 Please do not duplicate the email subject -- the change's one-line summary -- as the first line of the email. I had to hand-edit each of this duplicate information out, before applying the patches. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2.6.24] pcnet32: use NET_IP_ALIGN instead of 2
Don Fry wrote: Change hard coded 2 to NET_IP_ALIGN. Added new #define with comments. Tested amd_64 Signed-off-by: Don Fry [EMAIL PROTECTED] applied both -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/6] [NET] replace code with FIELD_SIZEOF
Auke Kok wrote: From: Julia Lawall [EMAIL PROTECTED] Signed-off-by: Julia Lawall [EMAIL PROTECTED] Signed-off-by: Auke Kok [EMAIL PROTECTED] --- drivers/net/e1000/e1000_ethtool.c |2 +- drivers/net/igb/igb_ethtool.c |2 +- drivers/net/ixgb/ixgb_ethtool.c |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) applied 1-6 to #upstream-fixes -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 1/5] claw: removal of volatile variables
applied 1-5 to #upstream-fixes (2.6.25) -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Patch 2.6.24 1/3]S2io: Support for vlan_rx_kill_vid entry point
Sreenivasa Honnur wrote: - Added s2io_vlan_rx_kill_vid entry point function for unregistering vlan. - Fix to aggregate vlan packets. IP offset is incremented by 4 bytes if the packet contains vlan header. - resubmit for 2.6.24 kernel Signed-off-by: Surjit Reang [EMAIL PROTECTED] Signed-off-by: Ramkrishna Vepa [EMAIL PROTECTED] it's difficult to sort through these patches, because they clash a bit with the kernel development model. You always need to send against the latest kernel (generally davem's tree if it's during -rc bug fix cycle, or linus's otherwise). Once the changes are in place, then email the commit ids or backported patches to [EMAIL PROTECTED] for inclusion in an already-released kernel. In this case, 2.6.24 was well on its way to being released weeks ago, when this set of patches was last resend (and then I subsequently screwed up, and apparently applied a wrong patch, as discussed) So what we need are patches against the latest kernel (torvalds/linux-2.6.git), and after those are applied, email [EMAIL PROTECTED] with whatever you want in 2.6.24.x. Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch] pegasus.c
Petko Manolov wrote: Hi Jeff, Attached you'll find a patch that is fixing a driver bug triggered when malformed string is passed to the 'devid' module parameter. The expected format is: device_name:vendor_id:device_id:flags but it turned out people often type: somename::0 instead of: somename:::0 ACK but two process problems preventing application: * patch is base64-encoded * no signed-off-by included -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/5] Tsi108_eth: add missing linking to driver data
Alexandre Bounine wrote: Bug fix for tsi108_eth network driver. This patch adds missing linking to driver data. Signed-off-by: Alexandre Bounine [EMAIL PROTECTED] --- diff -pNur linux-2.6.24/drivers/net/tsi108_eth.c linux-2.6.24-fix/drivers/net/tsi108_eth.c --- linux-2.6.24/drivers/net/tsi108_eth.c 2008-01-24 17:58:37.0 -0500 +++ linux-2.6.24-fix/drivers/net/tsi108_eth.c 2008-02-06 14:30:04.0 -0500 @@ -1629,6 +1629,7 @@ tsi108_init_one(struct platform_device * goto register_fail; } + platform_set_drvdata(pdev, dev); printk(KERN_INFO %s: Tsi108 Gigabit Ethernet, MAC: %s\n, dev-name, print_mac(mac, dev-dev_addr)); #ifdef DEBUG ACK, but your patches are unusable because they are word-wrapped -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/5] resend forcedeth: tx pause watermarks
Ayaz Abdulla wrote: New chipsets introduced variant Rx FIFO sizes that need to be taken into account when setting up the tx pause watermarks. This patch introduces the new device feature flags based on a version and implements the new watermarks. Signed-off-by: Ayaz Abdulla [EMAIL PROTECTED] applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] net: NEWEMAC: Remove rgmii-interface from rgmii matching table
Josh Boyer wrote: On Wed, 6 Feb 2008 13:21:59 +0100 Stefan Roese [EMAIL PROTECTED] wrote: With the removal the the rgmii-interface device_type property from the dts files, the newemac driver needs an update to only rely on compatible property. Signed-off-by: Stefan Roese [EMAIL PROTECTED] Acked-by: Benjamin Herrenschmidt [EMAIL PROTECTED] Acked-by: Josh Boyer [EMAIL PROTECTED] upon further reflection, ACK, take this via ppc tree -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Pull request for 'r6040' branch
Francois Romieu wrote: Please pull from branch 'r6040' in repository git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6.git r6040 to get the changes below. I have simply rebased the r6040 branch from december on top of Linus's latest head and given each patch a compile test. The content is identical to Florian's initial work (minus the removal of the unused TIMER_WUT and a duplicate update of an error counter). Distance from 'master' (21511abd0a248a3f225d3b611cfabb93124605a7) - ec6d2d453a932fd50c5fd95d5aac633b4e5f241d 106adf3c84d081776a1d1fbb8a047cad12af2bb9 b4f1255d6839bd970d5ff20a9c3d73f73c9adaa3 d248fd77902fcf33b0bc49ab521930877d94890f Diffstat drivers/net/r6040.c | 233 +- 1 files changed, 135 insertions(+), 98 deletions(-) Shortlog Florian Fainelli (4): r6040: do not use a private stats structure to store statistics r6040: add helpers to allocate and free the Tx/Rx buffers r6040: recover from transmit timeout r6040: cleanups pulled -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 1/2] qeth: new qeth device driver
please resend on top of the ctc driver update... -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] tulip: hardware mitigation simplify
Jeff Garzik wrote: Stephen Hemminger wrote: The hardware mitigation in tulip can be simpified. 1. The budget with new NAPI will always be less than RX_RING_SIZE because RX_RING_SIZE is 128 and weight is 16. 2. The received counter is redundunt, just use the work_done value. 3. Only one value is used from the mit_table[] Signed-off-by: Stephen Hemminger [EMAIL PROTECTED] grrr. Mozilla Thunderbird is annoying. Please help me out, and --don't-- reply to [EMAIL PROTECTED] T-bird's multi-profile stuff is fouling me up. Sorry :( Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 01/24 for-2.6.25] DM9000: Fix endian-ness of data accesses. Patch from: Laurent Pinchart [EMAIL PROTECTED]
Laurent Pinchart wrote: On Wednesday 06 February 2008 12:46, Jeff Garzik wrote: two comments: 1) you should be using __le16 type 2) seems like you should do the same for RxStatus, rather than splitting it The DM9000 datasheet (or rather the application notes) describes two distinct fields, even though they both contain some kind of status information. Sure, there are plenty of distinct fields, just like with every chipset. That doesn't mean byte instructions are the best choice. Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/5] forcedeth: restart tx/rx
Ayaz Abdulla wrote: This patch fixes the issue where the transmitter and receiver must be restarted when applying new changes to certain registers. Signed-off-by: Ayaz Abdulla [EMAIL PROTECTED] applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/5] forcedeth: tx collision fix
Ayaz Abdulla wrote: This patch supports a new fix in hardware regarding tx collisions. In the cases where we are in autoneg mode and the link partner is in forced mode, we need to setup the tx deferral register differently in order to reduce collisions on the wire. Signed-off-by: Ayaz Abdulla [EMAIL PROTECTED] failed to apply -- conflicts with the existing DEV_xxx flag section -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/5] forcedeth: phy status fix
Ayaz Abdulla wrote: The driver needs to ack only the phy status bits that it is currently handling and preserve the other bits for the other handlers. For example, when reading/writing from the phy, it should not clear the link change interrupt bit. This will cause a missing link change interrupt. Signed-off-by: Ayaz Abdulla [EMAIL PROTECTED] applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/5] forcedeth: tx pause watermarks
Ayaz Abdulla wrote: New chipsets introduced variant Rx FIFO sizes that need to be taken into account when setting up the tx pause watermarks. This patch introduces the new device feature flags based on a version and implements the new watermarks. Signed-off-by: Ayaz Abdulla [EMAIL PROTECTED] ACK but failed to apply -- didn't like the DEV_HAS_xxx section -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 5/5] forcedeth: preserve registers
Ayaz Abdulla wrote: Various registers need to be preserved before resetting the device. Signed-off-by: Ayaz Abdulla [EMAIL PROTECTED] applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Fix PHY Lib support for gianfar and ucc_geth
Andy Fleming wrote:
The PHY Lib now uses mutexes instead of spin_locks. ucc_geth
and gianfar both grab the locks in their mdio_reset functions,
so they need to use mutex_(un)lock instead. This was not caught
until someone tested it on an SMP system.
Signed-off-by: Andy Fleming [EMAIL PROTECTED]
---
drivers/net/gianfar_mii.c |4 ++--
drivers/net/ucc_geth_mii.c |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c
index 100bf41..6a647d9 100644
--- a/drivers/net/gianfar_mii.c
+++ b/drivers/net/gianfar_mii.c
@@ -127,7 +127,7 @@ int gfar_mdio_reset(struct mii_bus *bus)
struct gfar_mii __iomem *regs = (void __iomem *)bus-priv;
unsigned int timeout = PHY_INIT_TIMEOUT;
- spin_lock_bh(bus-mdio_lock);
+ mutex_lock(bus-mdio_lock);
/* Reset the management interface */
gfar_write(regs-miimcfg, MIIMCFG_RESET);
@@ -140,7 +140,7 @@ int gfar_mdio_reset(struct mii_bus *bus)
timeout--)
cpu_relax();
- spin_unlock_bh(bus-mdio_lock);
+ mutex_unlock(bus-mdio_lock);
if(timeout = 0) {
printk(KERN_ERR %s: The MII Bus is stuck!\n,
diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c
index e3ba14a..c69e654 100644
--- a/drivers/net/ucc_geth_mii.c
+++ b/drivers/net/ucc_geth_mii.c
@@ -109,7 +109,7 @@ int uec_mdio_reset(struct mii_bus *bus)
struct ucc_mii_mng __iomem *regs = (void __iomem *)bus-priv;
unsigned int timeout = PHY_INIT_TIMEOUT;
- spin_lock_bh(bus-mdio_lock);
+ mutex_lock(bus-mdio_lock);
/* Reset the management interface */
out_be32(regs-miimcfg, MIIMCFG_RESET_MANAGEMENT);
@@ -121,7 +121,7 @@ int uec_mdio_reset(struct mii_bus *bus)
while ((in_be32(regs-miimind) MIIMIND_BUSY) timeout--)
cpu_relax();
- spin_unlock_bh(bus-mdio_lock);
+ mutex_unlock(bus-mdio_lock);
applied
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[git patches] net driver updates
Please pull from 'upstream-davem' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
upstream-davem
to receive the following updates:
drivers/net/forcedeth.c | 49 +-
drivers/net/gianfar_mii.c |4 +-
drivers/net/iseries_veth.c|2 +-
drivers/net/ixgbe/ixgbe.h |4 +-
drivers/net/ixgbe/ixgbe_ethtool.c | 91 +++-
drivers/net/ixgbe/ixgbe_main.c| 305
drivers/net/mv643xx_eth.c | 11 +-
drivers/net/sky2.c| 17 +--
drivers/net/sky2.h|2 +-
drivers/net/tlan.c| 25 +++-
drivers/net/tulip/xircom_cb.c |2 +-
drivers/net/ucc_geth_mii.c|4 +-
drivers/net/virtio_net.c | 10 +-
drivers/net/wan/hdlc.c| 24 +--
drivers/net/wan/hdlc_cisco.c |5 +-
drivers/net/wan/hdlc_fr.c | 53 +++
drivers/net/wan/hdlc_ppp.c|2 +-
drivers/net/wan/hdlc_raw.c|2 +-
drivers/net/wan/hdlc_raw_eth.c|6 +-
drivers/net/wan/hdlc_x25.c| 10 +-
include/linux/hdlc.h | 25 +---
21 files changed, 398 insertions(+), 255 deletions(-)
Andy Fleming (1):
Fix PHY Lib support for gianfar and ucc_geth
Ayaz Abdulla (3):
forcedeth: restart tx/rx
forcedeth: phy status fix
forcedeth: preserve registers
Ayyappan Veeraiyan (8):
ixgbe: remove obsolete irq_sem, add driver state checking code
ixbge: remove TX lock and redo TX accounting.
ixbge: Make ethtool code account for media types
ixgbe: Fix pause code for ethtool
ixgbe: Fix FW init/release, make this code a function
ixgbe: properly return CHECKSUM_NONE, cleanup csum code
ixgbe: fix several counter register errata
ixgbe: add real-time traffic counters
Byron Bradley (1):
mv643xx_eth: fix byte order when checksum offload is enabled
Christian Borntraeger (1):
virtio net: fix oops on interface-up
Erik Mouw (1):
xircom_cb should return NETDEV_TX_BUSY when no descriptors available
Krzysztof Halasa (3):
Generic HDLC - fix kernel panic
Generic HDLC - remove now unneeded hdlc_device_desc
Generic HDLC - use random_ether_addr()
Leonardo Potenza (1):
drivers/net/tlan.c: compilation warning fix
Stephen Hemminger (1):
sky2: fix for Yukon FE (regression in 2.6.25)
Stephen Rothwell (1):
iSeries: fix section mismatch in iseries_veth
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 3634223..d4843d0 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -323,8 +323,8 @@ enum {
NvRegMIIStatus = 0x180,
#define NVREG_MIISTAT_ERROR0x0001
#define NVREG_MIISTAT_LINKCHANGE 0x0008
-#define NVREG_MIISTAT_MASK 0x000f
-#define NVREG_MIISTAT_MASK20x000f
+#define NVREG_MIISTAT_MASK_RW 0x0007
+#define NVREG_MIISTAT_MASK_ALL 0x000f
NvRegMIIMask = 0x184,
#define NVREG_MII_LINKCHANGE 0x0008
@@ -624,6 +624,9 @@ union ring_type {
#define NV_MSI_X_VECTOR_TX0x1
#define NV_MSI_X_VECTOR_OTHER 0x2
+#define NV_RESTART_TX 0x1
+#define NV_RESTART_RX 0x2
+
/* statistics */
struct nv_ethtool_str {
char name[ETH_GSTRING_LEN];
@@ -1061,7 +1064,7 @@ static int mii_rw(struct net_device *dev, int addr, int
miireg, int value)
u32 reg;
int retval;
- writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);
+ writel(NVREG_MIISTAT_MASK_RW, base + NvRegMIIStatus);
reg = readl(base + NvRegMIIControl);
if (reg NVREG_MIICTL_INUSE) {
@@ -1432,16 +1435,30 @@ static void nv_mac_reset(struct net_device *dev)
{
struct fe_priv *np = netdev_priv(dev);
u8 __iomem *base = get_hwbase(dev);
+ u32 temp1, temp2, temp3;
dprintk(KERN_DEBUG %s: nv_mac_reset\n, dev-name);
+
writel(NVREG_TXRXCTL_BIT2 | NVREG_TXRXCTL_RESET | np-txrxctl_bits,
base + NvRegTxRxControl);
pci_push(base);
+
+ /* save registers since they will be cleared on reset */
+ temp1 = readl(base + NvRegMacAddrA);
+ temp2 = readl(base + NvRegMacAddrB);
+ temp3 = readl(base + NvRegTransmitPoll);
+
writel(NVREG_MAC_RESET_ASSERT, base + NvRegMacReset);
pci_push(base);
udelay(NV_MAC_RESET_DELAY);
writel(0, base + NvRegMacReset);
pci_push(base);
udelay(NV_MAC_RESET_DELAY);
+
+ /* restore saved registers */
+ writel(temp1, base + NvRegMacAddrA);
+ writel(temp2, base + NvRegMacAddrB);
+ writel(temp3, base + NvRegTransmitPoll);
+
writel(NVREG_TXRXCTL_BIT2 | np-txrxctl_bits, base + NvRegTxRxControl);
pci_push(base);
}
@@ -2767,6 +2784,7 @@ static int nv_update_linkspeed(struct net_device *dev)
int mii_status;
int retval = 0;
u32 control_1000, status_1000, phyreg, pause_flags, txreg;
+ u32
Re: [PATCH] [NET] phy/broadcom: add support for BCM5481 PHY
Anton Vorontsov wrote:
This patch adds support for BCM5481 PHY. Unfortunately it's hard to
get specifications for this PHY, so its special register 0x18 isn't
annotated properly (but we know it's used to set up the delays).
I've kept the magic numbers, so we'll not forget to fix it at the
first opportunity, and will name that register and its bits correctly.
Signed-off-by: Anton Vorontsov [EMAIL PROTECTED]
---
drivers/net/phy/broadcom.c | 54
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 29666c8..d15280e 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -99,6 +99,41 @@ static int bcm54xx_config_intr(struct phy_device *phydev)
return err;
}
+static int bcm5481_config_aneg(struct phy_device *phydev)
+{
+ int ret;
+
+ /* Aneg firsly. */
+ ret = genphy_config_aneg(phydev);
+
+ /* Then we can set up the delay. */
+ if (phydev-interface == PHY_INTERFACE_MODE_RGMII_ID) {
+ u16 reg;
+
+ /*
+* There is no BCM5481 specification available, so down
+* here is everything we know about register 0x18. This
+* at least helps BCM5481 to successfuly receive packets
+* on MPC8360E-RDK board. Peter Barada [EMAIL PROTECTED]
+* says: This sets delay between the RXD and RXC signals
+* instead of using trace lengths to achieve timing.
+*/
+
+ /* Set RDX clk delay. */
+ reg = 0x7 | (0x7 12);
+ phy_write(phydev, 0x18, reg);
+
+ reg = phy_read(phydev, 0x18);
+ /* Set RDX-RXC skew. */
+ reg |= (1 8);
+ /* Write bits 14:0. */
+ reg |= (1 15);
+ phy_write(phydev, 0x18, reg);
+ }
+
+ return ret;
+}
+
static struct phy_driver bcm5411_driver = {
.phy_id = 0x00206070,
.phy_id_mask= 0xfff0,
@@ -141,6 +176,20 @@ static struct phy_driver bcm5461_driver = {
.driver = { .owner = THIS_MODULE },
};
+static struct phy_driver bcm5481_driver = {
+ .phy_id = 0x0143bca0,
+ .phy_id_mask= 0xfff0,
+ .name = Broadcom BCM5481,
+ .features = PHY_GBIT_FEATURES,
+ .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+ .config_init= bcm54xx_config_init,
+ .config_aneg= bcm5481_config_aneg,
+ .read_status= genphy_read_status,
+ .ack_interrupt = bcm54xx_ack_interrupt,
+ .config_intr= bcm54xx_config_intr,
+ .driver = { .owner = THIS_MODULE },
+};
+
static int __init broadcom_init(void)
{
int ret;
@@ -154,8 +203,13 @@ static int __init broadcom_init(void)
ret = phy_driver_register(bcm5461_driver);
if (ret)
goto out_5461;
+ ret = phy_driver_register(bcm5481_driver);
+ if (ret)
+ goto out_5481;
return ret;
applied
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] virtio_net: Fix open - interrupt race
Christian Borntraeger wrote:
Jeff,
Rusty is (supposed to be) on vacation. Can you send this fix against
virtio_net with your next network driver fixes for 2.6.25?
Thank you
-
I got the following oops during interface ifup. Unfortunately its not
easily reproducable so I cant say for sure that my fix fixes this
problem, but I am confident and I think its correct anyway:
2kernel BUG at /space/kvm/drivers/virtio/virtio_ring.c:234!
4illegal operation: 0001 [#1] PREEMPT SMP
4Modules linked in:
4CPU: 0 Not tainted 2.6.24zlive-guest-07293-gf1ca151-dirty #91
4Process swapper (pid: 0, task: 00800938, ksp: 0084ddb8)
4Krnl PSW : 040430018000 00466374 (vring_disable_cb+0x30/0x34)
4 R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:0 CC:3 PM:0 EA:3
4Krnl GPRS: 0001 0001 10003800
00466344
4 0e980900 008848b0 0084e748
4 0087b300 1237 1237
0f85bdd8
4 0e980920 001137c0 00464754
0f85bdd8
4Krnl Code: 00466368: e3b0b074lg %r11,112(%r11)
4 0046636e: 07febcr 15,%r14
4 00466370: a7f40001brc 15,466372
4 00466374: a7f4fff6brc 15,466360
4 00466378: eb7ff0500024stmg
%r7,%r15,80(%r15)
4 0046637e: a7f13e00tmll%r15,15872
4 00466382: b90400eflgr %r14,%r15
4 00466386: a7840001brc 8,466388
4Call Trace:
4([000201500f85c000] 0x201500f85c000)
4 [00466556] vring_interrupt+0x72/0x88
4 [004801a0] kvm_extint_handler+0x34/0x44
4 [0010d22c] do_extint+0xbc/0xf8
4 [00113f98] ext_no_vtime+0x16/0x1a
4 [0010a182] cpu_idle+0x216/0x238
4([0010a162] cpu_idle+0x1f6/0x238)
4 [00568656] rest_init+0xaa/0xb8
4 [0084ee2c] start_kernel+0x3fc/0x490
4 [00100020] _stext+0x20/0x80
4
4 0Kernel panic - not syncing: Fatal exception in interrupt
4
After looking at the code and the dump I think the following scenario
happened: Ifup was running on cpu2 and the interrupt arrived on cpu0.
Now virtnet_open on cpu 2 managed to execute napi_enable and disable_cb
but did not execute rx_schedule. Meanwhile on cpu 0 skb_recv_done was
called by vring_interrupt, executed netif_rx_schedule_prep, which
succeeded and therefore called disable_cb. This triggered the BUG_ON,
as interrupts were already disabled by cpu 2.
I think the proper solution is to make the call to disable_cb depend on
the atomic update of NAPI_STATE_SCHED by using netif_rx_schedule_prep
in the same way as skb_recv_done.
Signed-off-by: Christian Borntraeger [EMAIL PROTECTED]
Acked-by: Rusty Russell [EMAIL PROTECTED]
---
drivers/net/virtio_net.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
Index: kvm/drivers/net/virtio_net.c
===
--- kvm.orig/drivers/net/virtio_net.c
+++ kvm/drivers/net/virtio_net.c
@@ -321,10 +321,12 @@ static int virtnet_open(struct net_devic
/* If all buffers were filled by other side before we napi_enabled, we
* won't get another interrupt, so process any outstanding packets
-* now. virtnet_poll wants re-enable the queue, so we disable here. */
- vi-rvq-vq_ops-disable_cb(vi-rvq);
- netif_rx_schedule(vi-dev, vi-napi);
-
+* now. virtnet_poll wants re-enable the queue, so we disable here.
+* We synchronize against interrupts via NAPI_STATE_SCHED */
+ if (netif_rx_schedule_prep(dev, vi-napi)) {
+ vi-rvq-vq_ops-disable_cb(vi-rvq);
+ __netif_rx_schedule(dev, vi-napi);
+ }
return 0;
}
applied
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 01/24 for-2.6.25] DM9000: Fix endian-ness of data accesses. Patch from: Laurent Pinchart [EMAIL PROTECTED]
two comments: 1) you should be using __le16 type 2) seems like you should do the same for RxStatus, rather than splitting it -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] net: NEWEMAC: Remove rgmii-interface from rgmii matching table
Josh Boyer wrote: On Thu, 31 Jan 2008 10:14:58 +1100 Benjamin Herrenschmidt [EMAIL PROTECTED] wrote: On Wed, 2008-01-30 at 07:16 +0100, Stefan Roese wrote: On Wednesday 16 January 2008, Josh Boyer wrote: On Wed, 16 Jan 2008 20:53:59 +1100 Benjamin Herrenschmidt [EMAIL PROTECTED] wrote: On Wed, 2008-01-16 at 10:37 +0100, Stefan Roese wrote: With the removal the the rgmii-interface device_type property from the dts files, the newemac driver needs an update to only rely on compatible property. Signed-off-by: Stefan Roese [EMAIL PROTECTED] I need to test if it works on CAB, can't change the DT on those. I'll let you know tomorrow. This should be fine on CAB. The rgmii node has: compatible = ibm,rgmii-axon, ibm,rgmii so the match should still catch on the latter. How about this patch? Ben, if you think this is ok then we should make sure that it goes in in this merge-window, since the other dts patch relies on it. It's fine. Jeff, any chance this can get into .25 soon? I have another patch queued up behind this one that requires it, and I don't see it in any of your trees or branches. Or, if you aren't opposed, I can take it through Paul's tree with your Ack. can you resend? I don't see it in the pile -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] e1000: Fix for 32 bits platforms with 64 bits resources
Benjamin Herrenschmidt wrote: The e1000 driver stores the content of the PCI resources into unsigned long's before ioremapping. This breaks on 32 bits platforms that support 64 bits MMIO resources such as ppc 44x. This fixes it by removing those temporary variables and passing directly the result of pci_resource_start/len to ioremap. The side effect is that I removed the assignments to the netdev fields mem_start, mem_end and base_addr, which are totally useless for PCI devices. Signed-off-by: Benjamin Herrenschmidt [EMAIL PROTECTED] -- drivers/net/e1000/e1000_main.c | 18 +- 1 file changed, 5 insertions(+), 13 deletions(-) applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 2/4] forcedeth: fix MAC address detection on network card (regression in 2.6.23)
[EMAIL PROTECTED] wrote: From: Michael Pyne [EMAIL PROTECTED] Partially revert a change to mac address detection introduced to the forcedeth driver. The change was intended to correct mac address detection for newer nVidia chipsets where the mac address was stored in reverse order. One of those chipsets appears to still have the mac address in reverse order (or at least, it does on my system). The change that broke mac address detection for my card was commit ef756b3e56c68a4d76d9d7b9a73fa8f4f739180f forcedeth: mac address correct My network card is an nVidia built-in Ethernet card, output from lspci as follows (with text and numeric ids): $ lspci | grep Ethernet 00:07.0 Bridge: nVidia Corporation MCP61 Ethernet (rev a2) $ lspci -n | grep 07.0 00:07.0 0680: 10de:03ef (rev a2) The vendor id is, of course, nVidia. The device id corresponds to the NVIDIA_NVENET_19 entry. The included patch fixes the MAC address detection on my system. Interestingly, the MAC address appears to be in the range reserved for my motherboard manufacturer (Gigabyte) and not nVidia. Signed-off-by: Michael J. Pyne [EMAIL PROTECTED] Cc: Jeff Garzik [EMAIL PROTECTED] Cc: Ayaz Abdulla [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] On Wed, 21 Nov 2007 15:34:52 -0800 Ayaz Abdulla [EMAIL PROTECTED] wrote: The solution is to get the OEM to update their BIOS (instead of integrating this patch) since the MCP61 specs indicate that the MAC Address should be in correct order from BIOS. By changing the feature DEV_HAS_CORRECT_MACADDR to all MCP61 boards, it could cause it to break on other OEM systems who have implemented it correctly. Signed-off-by: Andrew Morton [EMAIL PROTECTED] NAK - this fixes one set of users, and breaks a working set of users. Need to add DMI check for the specific motherboard (dmi_check_system), and flip flag according to success/failure of that check. Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] [PPPOL2TP] Label unused warning when CONFIG_PROC_FS is not set.
Rami Rosen wrote: Hi, When CONFIG_PROC_FS is not set and CONFIG_PPPOL2TP is set, we have the following warning in build: drivers/net/pppol2tp.c: In function 'pppol2tp_init': drivers/net/pppol2tp.c:2472: warning: label 'out_unregister_pppox_proto' defined but not used This patches fixes this warning by adding appropriate #ifdef. Regards, Rami Rosen Signed-off-by: Rami Rosen [EMAIL PROTECTED] David or Paul, wanna pick this up? -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] [POWERPC] iSeries: fix section mismatch in iseries_veth
Stephen Rothwell wrote:
WARNING: vmlinux.o(.text+0x25dca0): Section mismatch in reference from the
function .veth_probe() to the function .init.text:.veth_probe_one()
Signed-off-by: Stephen Rothwell [EMAIL PROTECTED]
---
drivers/net/iseries_veth.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Jeff, can this go in through the powerpc tree?
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 419861c..58d3bb6 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -1020,7 +1020,7 @@ static const struct ethtool_ops ops = {
.get_link = veth_get_link,
};
-static struct net_device * __init veth_probe_one(int vlan,
+static struct net_device *veth_probe_one(int vlan,
struct vio_dev *vio_dev)
{
it's trivial enough to not matter, and faster to just... applied
(if you'll pardon the bad grammar)
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 3/4] mv643xx_eth: fix byte order when checksum offload is enabled
[EMAIL PROTECTED] wrote: From: Byron Bradley [EMAIL PROTECTED] The Marvell Orion system on chips have an integrated mv643xx MAC. On these little endian ARM devices mv643xx will oops when checksum offload is enabled. Swapping the byte order of the protocol and checksum solves this problem. Signed-off-by: Byron Bradley [EMAIL PROTECTED] Cc: Dale Farnsworth [EMAIL PROTECTED] Cc: Manish Lachwani [EMAIL PROTECTED] Cc: Jeff Garzik [EMAIL PROTECTED] Cc: Al Viro [EMAIL PROTECTED] Signed-off-by: Andrew Morton [EMAIL PROTECTED] --- drivers/net/mv643xx_eth.c | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) applied 3-4 -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] xircom_cb should return NETDEV_TX_BUSY when there are no descriptors available
Erik Mouw wrote: Hi, Changes in other networking paths uncovered a bug in the xircom_cb driver which made the kernel spew lots of the following error messages: BUG eth1 code -5 qlen 0 It turned out that the driver returned -EIO when there was no descriptor available for sending packets. It should return NETDEV_TX_BUSY instead. This was discussed on the netdev list before, see http://thread.gmane.org/gmane.linux.network/84603 . Signed-off-by: Erik Mouw [EMAIL PROTECTED] diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c index 8fc7274..6b93d01 100644 --- a/drivers/net/tulip/xircom_cb.c +++ b/drivers/net/tulip/xircom_cb.c @@ -441,7 +441,7 @@ static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev) spin_unlock_irqrestore(card-lock,flags); trigger_transmit(card); - return -EIO; + return NETDEV_TX_BUSY; } applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 8/8] ixgbe: add real-time traffic counters
Auke Kok wrote: From: Ayyappan Veeraiyan [EMAIL PROTECTED] Just like our other drivers before we can switch ixgbe to provide real-time packet/byte counters to the stack easily. Signed-off-by: Ayyappan Veeraiyan [EMAIL PROTECTED] Signed-off-by: Auke Kok [EMAIL PROTECTED] --- drivers/net/ixgbe/ixgbe_main.c | 15 +++ 1 files changed, 11 insertions(+), 4 deletions(-) applied 1-8 -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/3] Generic HDLC - fix kernel panic
Krzysztof Halasa wrote: Fixes kernel panic in Frame Relay mode Signed-off-by: Krzysztof Halasa [EMAIL PROTECTED] applied 1-3 -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] sky2: fix for Yukon FE (regression in 2.6.25)
Stephen Hemminger wrote: The Yukon FE chip has a ram buffer therefore it needs the alignment restriction and hang check workarounds. Therefore: * Autodetect the prescence/absence of ram buffer * Rename the flag value to reflect this * Use it consistently (ie don't reread register) Signed-off-by: Stephen Hemminger [EMAIL PROTECTED] applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 2/4] forcedeth: fix MAC address detection on network card (regression in 2.6.23)
H. Peter Anvin wrote: Jeff Garzik wrote: Signed-off-by: Andrew Morton [EMAIL PROTECTED] NAK - this fixes one set of users, and breaks a working set of users. Need to add DMI check for the specific motherboard (dmi_check_system), and flip flag according to success/failure of that check. Either that, or detect the Gigabyte prefix used as a suffix, since they seem to be the source of this particular f*ckup. Indeed, that would work too... though we would need to put out a call for Gigabyte testers during 2.6.25-rc. It is an entirely reasonable scenario for NVIDIA to deploy a fix to Gigabyte, which would then return us to the same scenario we have today: some work and some don't. That's my main reason for leaning more conservative here. Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 2/4] forcedeth: fix MAC address detection on network card (regression in 2.6.23)
Andrew Morton wrote:
On Tue, 05 Feb 2008 13:20:59 -0500 Jeff Garzik [EMAIL PROTECTED] wrote:
Signed-off-by: Andrew Morton [EMAIL PROTECTED]
NAK - this fixes one set of users, and breaks a working set of users.
Need to add DMI check for the specific motherboard (dmi_check_system),
and flip flag according to success/failure of that check.
OK :) I added the above to the changelog for next time.
You guys can hide, but this patch isn't going away!
In the original thread, I even posted a
fill-in-the-blanks-with-the-motherboard-name patch. I'll attach it again...
Jeff
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 3634223..eab85fa 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -147,6 +147,7 @@
#include linux/init.h
#include linux/if_vlan.h
#include linux/dma-mapping.h
+#include linux/dmi.h
#include asm/irq.h
#include asm/io.h
@@ -4992,6 +4993,26 @@ static int nv_close(struct net_device *dev)
return 0;
}
+static int nv_reversed_macaddr(void)
+{
+ static const struct dmi_system_id sysids[] = {
+ {
+ .ident = ,
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, ),
+ DMI_MATCH(DMI_PRODUCT_NAME, ),
+ },
+ },
+
+ { } /* terminate list */
+ };
+
+ if (dmi_check_system(sysids))
+ return 1;
+
+ return 0;
+}
+
static int __devinit nv_probe(struct pci_dev *pci_dev, const struct
pci_device_id *id)
{
struct net_device *dev;
@@ -5187,8 +5208,9 @@ static int __devinit nv_probe(struct pci_dev *pci_dev,
const struct pci_device_i
/* check the workaround bit for correct mac address order */
txreg = readl(base + NvRegTransmitPoll);
- if ((txreg NVREG_TRANSMITPOLL_MAC_ADDR_REV) ||
- (id-driver_data DEV_HAS_CORRECT_MACADDR)) {
+ if (((txreg NVREG_TRANSMITPOLL_MAC_ADDR_REV) ||
+ (id-driver_data DEV_HAS_CORRECT_MACADDR)))
+ (!nv_reversed_macaddr())) {
/* mac address is already in correct order */
dev-dev_addr[0] = (np-orig_mac[0] 0) 0xff;
dev-dev_addr[1] = (np-orig_mac[0] 8) 0xff;
Re: [patch 2/4] forcedeth: fix MAC address detection on network card (regression in 2.6.23)
Ayaz Abdulla wrote: Andrew Morton wrote: On Tue, 05 Feb 2008 13:20:59 -0500 Jeff Garzik [EMAIL PROTECTED] wrote: Signed-off-by: Andrew Morton [EMAIL PROTECTED] NAK - this fixes one set of users, and breaks a working set of users. Need to add DMI check for the specific motherboard (dmi_check_system), and flip flag according to success/failure of that check. OK :) I added the above to the changelog for next time. You guys can hide, but this patch isn't going away! I believe Michael determined that a newer BIOS fixes this issue. That's a solution that makes vendors happy... but we still have to deal with it in Linux. There are plenty of the old broken BIOS still out in the field... Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] xircom_cb should return NETDEV_TX_BUSY when there are no descriptors available
Erik Mouw wrote: On Mon, Feb 04, 2008 at 06:56:54PM +0100, Erik Mouw wrote: Changes in other networking paths uncovered a bug in the xircom_cb driver which made the kernel spew lots of the following error messages: BUG eth1 code -5 qlen 0 It turned out that the driver returned -EIO when there was no descriptor available for sending packets. It should return NETDEV_TX_BUSY instead. This was discussed on the netdev list before, see http://thread.gmane.org/gmane.linux.network/84603 . Signed-off-by: Erik Mouw [EMAIL PROTECTED] Forgot to tell: the patch is against 2.6.24 but should apply cleanly to the latest git kernel. The xircom_cb driver appears to be orphaned so I've send the patch to you. Yep, that's the right thing to do... Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] [RFC] 3c509: convert to isa_driver and pnp_driver v2
Ondrej Zary wrote: Hello, this is second version of the patch. Autoloading using udev works fine with PnP card. Hibernation now works both in PnP and ISA modes. The I/O address used for non-pnp ISA card detection is now not released as it's needed to wake up the card. Manual irq and transceiver settings aren't implemented yet. Operation with multiple cards is not tested - I'll try 3 cards in both PnP and ISA modes. There is some code that is the same in each of the 4 probe functions (isa, pnp, eisa and mca), which should be probably separated into a function. I have no EISA or MCA machine so I hope that I didn't break them. Looks pretty good at first glance... I'll throw it in my queue. Want to add a signed-off-by: ? Jeff -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] [POWERPC][NET][SERIAL] UCCs: replace device-id with cell-index
Anton Vorontsov wrote:
On Fri, Feb 01, 2008 at 09:32:38AM -0600, Kumar Gala wrote:
On Feb 1, 2008, at 9:01 AM, Anton Vorontsov wrote:
It isn't used anywhere, so remove it. If we'll ever need something
like this, we'll use compatible property instead.
Signed-off-by: Anton Vorontsov [EMAIL PROTECTED]
---
Rebased on top of recent tree.
Documentation/powerpc/booting-without-of.txt |1 -
arch/powerpc/boot/dts/mpc832x_mds.dts|3 ---
arch/powerpc/boot/dts/mpc832x_rdb.dts|2 --
arch/powerpc/boot/dts/mpc836x_mds.dts|2 --
arch/powerpc/boot/dts/mpc8568mds.dts |2 --
5 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/Documentation/powerpc/booting-without-of.txt b/
Documentation/powerpc/booting-without-of.txt
index 410c847..dcf9758 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -1675,7 +1675,6 @@ platforms are moved over to use the flattened-
device-tree model.
[EMAIL PROTECTED] {
device_type = network;
compatible = ucc_geth;
- model = UCC;
device-id = 1;
can we change device-id to cell-index?
Sure. But let's do this in the separate patch? Because this change
actually touches the code in the two subsystems: net and serial.
I hope everybody will agree to pass it through powerpc tree..?
- - - -
From: Anton Vorontsov [EMAIL PROTECTED]
Subject: [POWERPC][NET][SERIAL] UCCs: replace device-id with cell-index
device-id is worse than cell-index. Probably cell-index isn't
good either, but device-id is worse anyway.
Drivers are modified for backward compatibility's sake.
Signed-off-by: Anton Vorontsov [EMAIL PROTECTED]
---
Documentation/powerpc/booting-without-of.txt |4 ++--
arch/powerpc/boot/dts/mpc832x_mds.dts|4 +---
arch/powerpc/boot/dts/mpc832x_rdb.dts|2 --
arch/powerpc/boot/dts/mpc836x_mds.dts|2 --
arch/powerpc/boot/dts/mpc836x_rdk.dts| 12 ++--
arch/powerpc/boot/dts/mpc8568mds.dts |2 --
drivers/net/ucc_geth.c |8 +++-
drivers/net/ucc_geth_mii.c | 11 ---
drivers/serial/ucc_uart.c| 16
9 files changed, 36 insertions(+), 25 deletions(-)
ACK drivers/net
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/5] ehea: fix ehea.h checkpatch complaints
Doug Maxey wrote: Cc: Jan-Bernd Themann [EMAIL PROTECTED] Signed-off-by: Doug Maxey [EMAIL PROTECTED] --- drivers/net/ehea/ehea.h|3 +++ drivers/net/ehea/ehea_hw.h |8 2 files changed, 7 insertions(+), 4 deletions(-) applied 1-5 -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH for 2.6.25 1/2] [NET] ucc_geth: fix module removal
Anton Vorontsov wrote: - uccf should be set to NULL to not double-free memory on subsequent calls; - ind_hash_q and group_hash_q lists should be initialized in the probe() function, instead of struct_init() (called by open()), otherwise there will be an oops if ucc_geth_driver removed prior 'ifconfig ethX up'; - add unregister_netdev(); - reorder geth_remove() steps. Signed-off-by: Anton Vorontsov [EMAIL PROTECTED] --- Hi Li, You kinda promised that these two patches would hit 2.6.25... ;-) I've rebased the patches so they apply cleanly on the current tree. Thanks, drivers/net/ucc_geth.c | 17 ++--- 1 files changed, 10 insertions(+), 7 deletions(-) applied 1-2 -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ehea: fix sysfs link compile problem
Jan-Bernd Themann wrote: Due to changes in the struct device_driver there is no direct access to its kobj any longer. The kobj was used to create sysfs links between eHEA ethernet devices and the driver. This patch removes the affected sysfs links to resolve the build problems. Signed-off-by: Jan-Bernd Themann [EMAIL PROTECTED] --- drivers/net/ehea/ehea_main.c | 37 - 1 files changed, 0 insertions(+), 37 deletions(-) applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: NET: AX88796 use dev_dbg() instead of printk()
applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [2.6 patch] via-rhine.c:rhine_hw_init() must be __devinit
applied the net driver portion of these patches... -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: rtl8150: use default MTU of 1500
Lennert Buytenhek wrote:
The RTL8150 driver uses an MTU of 1540 by default, which causes a
bunch of problems -- it prevents booting from NFS root, for one.
Signed-off-by: Lennert Buytenhek [EMAIL PROTECTED]
Cc: Petko Manolov [EMAIL PROTECTED]
--- linux-2.6.24-git7.orig/drivers/net/usb/rtl8150.c2008-01-24
23:58:37.0 +0100
+++ linux-2.6.24-git7/drivers/net/usb/rtl8150.c 2008-01-30 20:29:00.0
+0100
@@ -925,9 +925,8 @@
netdev-hard_start_xmit = rtl8150_start_xmit;
netdev-set_multicast_list = rtl8150_set_multicast;
netdev-set_mac_address = rtl8150_set_mac_address;
netdev-get_stats = rtl8150_netdev_stats;
- netdev-mtu = RTL8150_MTU;
SET_ETHTOOL_OPS(netdev, ops);
dev-intr_interval = 100;/* 100ms */
if (!alloc_all_urbs(dev)) {
applied
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] macb: Fix section mismatch and shrink runtime footprint
Haavard Skinnemoen wrote: macb devices are only found integrated on SoCs, so they can't be hotplugged. Thus, the probe() and exit() functions can be __init and __exit, respectively. By using platform_driver_probe() instead of platform_driver_register(), there won't be any references to the discarded probe() function after the driver has loaded. This also fixes a section mismatch due to macb_probe(), defined as __devinit, calling macb_get_hwaddr, defined as __init. Signed-off-by: Haavard Skinnemoen [EMAIL PROTECTED] --- drivers/net/macb.c |9 - 1 files changed, 4 insertions(+), 5 deletions(-) applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2.6.24] e1000e: add new wakeup cababilities
Mitch Williams wrote: Ethtool supports wake-on-ARP and wake-on-link, and so does the hardware supported by e1000e. This patch just introduces the two. Signed-off-by: Mitch Williams [EMAIL PROTECTED] applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] PHYLIB: Add BCM5482 PHY support
Nate Case wrote: This Broadcom PHY is similar to other bcm54xx devices. Signed-off-by: Nate Case [EMAIL PROTECTED] --- drivers/net/phy/broadcom.c | 20 1 files changed, 20 insertions(+), 0 deletions(-) applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Patch 2.6.24 1/3]S2io: Support for vlan_rx_kill_vid entry point
Sreenivasa Honnur wrote: - Added s2io_vlan_rx_kill_vid entry point function for unregistering vlan. - Fix to aggregate vlan packets. IP offset is incremented by 4 bytes if the packet contains vlan header. Signed-off-by: Surjit Reang [EMAIL PROTECTED] Signed-off-by: Ramkrishna Vepa [EMAIL PROTECTED] applied 1-2, patch #3 failed to apply -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/3] pasemi_mac: Add support for changing mac address
Olof Johansson wrote: Straightforward. It used to be hardcoded and impossible to override with ifconfig. Signed-off-by: Olof Johansson [EMAIL PROTECTED] applied 1-3 -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/6] e1000e: make a function static
applied 1-6 -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [2.6 patch] remove obsolete tokenring maintainer information
Adrian Bunk wrote: - Peter's email address is bouncing - the project webpage no longer exists - neither Peter nor Mike had a single patch included in the kernel since 2.6.12-rc2 (when the git history begins) Signed-off-by: Adrian Bunk [EMAIL PROTECTED] --- MAINTAINERS | 23 --- 1 file changed, 23 deletions(-) applied -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/5] ehea: fix ehea.h checkpatch complaints
Jeff Garzik wrote: Doug Maxey wrote: Cc: Jan-Bernd Themann [EMAIL PROTECTED] Signed-off-by: Doug Maxey [EMAIL PROTECTED] --- drivers/net/ehea/ehea.h|3 +++ drivers/net/ehea/ehea_hw.h |8 2 files changed, 7 insertions(+), 4 deletions(-) applied 1-5 BTW please do not reply to [EMAIL PROTECTED] That was a Thunderbird fsck-up on my side. -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
