Re: net-2.6.24 rebased...
David Miller wrote: From: Urs Thuermann [EMAIL PROTECTED] Date: 09 Oct 2007 23:13:42 +0200 Last week I have sent another version of our patch series for PF_CAN. The changes after the last review feedback were only cosmetics. Do you have any plans with that code for this or the next release? I think PF_CAN will go in 2.6.25 Good news. Thanks! I'll keep on tracking the current patch flow to be sure that we're still on the head of development, when net-2.6.25 hits the ground. Best regards, Oliver - 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
net-2.6.24 rebased...
The TCP bug fix that went into Linus's tree today created some conflicts with net-2.6.24, so I rebased: kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.24.git I took the opportunity to integrate fix patches into the patches which introduced those bugs or build failures. BTW, when the tree gets this big I tend to move the pre-rebase tree to: kernel.org:/pub/scm/linux/kernel/git/davem/bak-net-2.6.24.git It can be useful if a mistake is made during a rebase and we need to figure out what happened. 9.1MB, 739 changesets, keep those patches flowing! Enjoy - 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-2.6.24 rebased...
Hallo Dave, 9.1MB, 739 changesets, keep those patches flowing! Last week I have sent another version of our patch series for PF_CAN. The changes after the last review feedback were only cosmetics. Do you have any plans with that code for this or the next release? Regards, urs - 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-2.6.24 rebased...
From: Urs Thuermann [EMAIL PROTECTED] Date: 09 Oct 2007 23:13:42 +0200 Last week I have sent another version of our patch series for PF_CAN. The changes after the last review feedback were only cosmetics. Do you have any plans with that code for this or the next release? I think PF_CAN will go in 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
net-2.6.24 rebased
Available as usual at: kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.24.git I resolved the SCTP and network driver conflicts that come standard with a rebase to Linus's current tree. We're up to 700 changesets and an 8.7 MB patch, w00t! I've been using it for an hour or so on my workstation so something works. It also passes an allmodconfig build on sparc64. Either later tonight or some time tomorrow I'll start hitting the patch backlog in my inbox. Thanks. - 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
net-2.6.24 rebased...
Ok the rebase is complete and I integrated all of the easy stuff in my backlog. In the usual spot: kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git John, one patch didn't go in cleanly after I removed the Z1211 driver. I put it here for your consideration so it doesn't get lost: http://vger.kernel.org/~davem/0433-Z1211-Fix-TX-status-reports.patch What probably needs to happen is some other changes that were in z1211 need to go into the non-mac80211 driver and then this patch applies correctly. I tried the simple thing to rename the directory in the patch and that didn't work, obviously :-) Jeff, if you have any pending driver bits please toss them my way as most of my backlog is clear now. Andrew, I applied a good chunk of the driver build fixes you had accumulated. I think I missed one or two, so please check that out and send my way the ones that I missed. Thanks! - 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-2.6.24 rebased...
On Tue, 2007-09-25 at 23:33 -0700, David Miller wrote: http://vger.kernel.org/~davem/0433-Z1211-Fix-TX-status-reports.patch What probably needs to happen is some other changes that were in z1211 need to go into the non-mac80211 driver and then this patch applies correctly. I tried the simple thing to rename the directory in the patch and that didn't work, obviously :-) That patch is specific to the mac80211 version and you don't have that yet, it just needs to be stick along with it till the next time. johannes signature.asc Description: This is a digitally signed message part
Re: net-2.6.24 rebased...
On Tue, Sep 25, 2007 at 11:33:44PM -0700, David Miller wrote: John, one patch didn't go in cleanly after I removed the Z1211 driver. I put it here for your consideration so it doesn't get lost: http://vger.kernel.org/~davem/0433-Z1211-Fix-TX-status-reports.patch What probably needs to happen is some other changes that were in z1211 need to go into the non-mac80211 driver and then this patch applies correctly. I have that one, so we're fine. It is a mac80211-specific fix, so I think that takes care of it. Thanks! John -- John W. Linville [EMAIL PROTECTED] - 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-2.6.24 rebased...
From: John W. Linville [EMAIL PROTECTED] Date: Wed, 26 Sep 2007 08:46:49 -0400 On Tue, Sep 25, 2007 at 11:33:44PM -0700, David Miller wrote: John, one patch didn't go in cleanly after I removed the Z1211 driver. I put it here for your consideration so it doesn't get lost: http://vger.kernel.org/~davem/0433-Z1211-Fix-TX-status-reports.patch What probably needs to happen is some other changes that were in z1211 need to go into the non-mac80211 driver and then this patch applies correctly. I have that one, so we're fine. It is a mac80211-specific fix, so I think that takes care of it. Great, thanks to everyone for checking this out. - 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
net-2.6.24 rebased
Upstream got a backport of my netdev-priv fixes for the cxgb3 driver, creating a bunch of conflicts with the napi_struct changes, so I took the opportunity to refresh the tree and combine some bug fixes into the changes that introduced those bugs :-) (bug fix attributions were added to the changelogs as needed) kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.24.git I've tried to sanity check this rebase as best as possible but mistakes are always possible especially since I'm doing this from the kernel summit in Cambridge :-) I've kept the previous tree around as bak-net-2.6.24.git so it can be referenced for researching potential mistakes. Enjoy! - 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-2.6.24 rebased
On Thu, Aug 30, 2007 at 10:21:29PM -0700, David Miller wrote: From: Johannes Berg [EMAIL PROTECTED] Date: Thu, 30 Aug 2007 13:58:12 +0200 Huh? I'm fairly sure I sent a patch to remove it from that driver, no idea where it got lost. FWIW, you can simply delete the | IEEE80211_HW_DATA_NULLFUNC_ACK part. It might have been a mis-merge between John and myself. A few times because I had rebased I had to take his directory of patches and one of us might have made a mistake somewhere along the line. In any event, I've removed the offending line from the driver. Sorry, I sent the patch through Jeff. http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/upstream-jgarzik/0010-rtl8187-remove-IEEE80211_HW_DATA_NULLFUNC_ACK.patch But, it sounds like you have taken care of it...? Let me know if I need to fix this. John -- John W. Linville [EMAIL PROTECTED] - 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-2.6.24 rebased
From: John W. Linville [EMAIL PROTECTED] Date: Fri, 31 Aug 2007 09:44:32 -0400 Sorry, I sent the patch through Jeff. http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/upstream-jgarzik/0010-rtl8187-remove-IEEE80211_HW_DATA_NULLFUNC_ACK.patch But, it sounds like you have taken care of it...? Let me know if I need to fix this. Thanks for tracking this down, that is exactly the change I checked into 2.6.24 so everything is good now. - 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-2.6.24 rebased
On Wed, 2007-08-29 at 16:47 -0700, Joe Perches wrote: On Wed, 2007-08-29 at 16:41 -0700, David Miller wrote: From: Joe Perches [EMAIL PROTECTED] Date: Wed, 29 Aug 2007 16:34:00 -0700 On Tue, 2007-08-28 at 17:59 -0700, David Miller wrote: I pushed this fix into net-2.6.24 just now, thanks again. This tree doesn't compile for me defconfig CC drivers/net/forcedeth.o drivers/net/forcedeth.c: In function ‘nv_probe’: drivers/net/forcedeth.c:5158: error: ‘nv_napi_poll’ undeclared (first use in this function) drivers/net/forcedeth.c:5158: error: (Each undeclared identifier is reported only once drivers/net/forcedeth.c:5158: error: for each function it appears in.) make[2]: *** [drivers/net/forcedeth.o] Error 1 make[1]: *** [drivers/net] Error 2 make: *** [drivers] Error 2 allyesconfig fails at: CC drivers/net/wireless/rtl8187_dev.o drivers/net/wireless/rtl8187_dev.c: In function ‘rtl8187_probe’: drivers/net/wireless/rtl8187_dev.c:610: error: ‘IEEE80211_HW_DATA_NULLFUNC_ACK’ undeclared (first use in this function) drivers/net/wireless/rtl8187_dev.c:610: error: (Each undeclared identifier is reported only once drivers/net/wireless/rtl8187_dev.c:610: error: for each function it appears in.) make[3]: *** [drivers/net/wireless/rtl8187_dev.o] Error 1 make[2]: *** [drivers/net/wireless] Error 2 make[1]: *** [drivers/net] Error 2 make: *** [drivers] Error 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: net-2.6.24 rebased
On Wed, 2007-08-29 at 23:19 -0700, Joe Perches wrote: CC drivers/net/wireless/rtl8187_dev.o drivers/net/wireless/rtl8187_dev.c: In function ‘rtl8187_probe’: drivers/net/wireless/rtl8187_dev.c:610: error: ‘IEEE80211_HW_DATA_NULLFUNC_ACK’ undeclared (first use in this function) drivers/net/wireless/rtl8187_dev.c:610: error: (Each undeclared identifier is reported only once drivers/net/wireless/rtl8187_dev.c:610: error: for each function it appears in.) make[3]: *** [drivers/net/wireless/rtl8187_dev.o] Error 1 make[2]: *** [drivers/net/wireless] Error 2 make[1]: *** [drivers/net] Error 2 make: *** [drivers] Error 2 Huh? I'm fairly sure I sent a patch to remove it from that driver, no idea where it got lost. FWIW, you can simply delete the | IEEE80211_HW_DATA_NULLFUNC_ACK part. johannes signature.asc Description: This is a digitally signed message part
Re: net-2.6.24 rebased
From: Johannes Berg [EMAIL PROTECTED] Date: Thu, 30 Aug 2007 13:58:12 +0200 Huh? I'm fairly sure I sent a patch to remove it from that driver, no idea where it got lost. FWIW, you can simply delete the | IEEE80211_HW_DATA_NULLFUNC_ACK part. It might have been a mis-merge between John and myself. A few times because I had rebased I had to take his directory of patches and one of us might have made a mistake somewhere along the line. In any event, I've removed the offending line from the driver. - 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-2.6.24 rebased
On Wed, 2007-08-29 at 16:41 -0700, David Miller wrote: From: Joe Perches [EMAIL PROTECTED] Date: Wed, 29 Aug 2007 16:34:00 -0700 On Tue, 2007-08-28 at 17:59 -0700, David Miller wrote: I pushed this fix into net-2.6.24 just now, thanks again. This tree doesn't compile for me defconfig CC drivers/net/forcedeth.o drivers/net/forcedeth.c: In function ‘nv_probe’: drivers/net/forcedeth.c:5158: error: ‘nv_napi_poll’ undeclared (first use in this function) drivers/net/forcedeth.c:5158: error: (Each undeclared identifier is reported only once drivers/net/forcedeth.c:5158: error: for each function it appears in.) make[2]: *** [drivers/net/forcedeth.o] Error 1 make[1]: *** [drivers/net] Error 2 make: *** [drivers] Error 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
net-2.6.24 rebased
The new NAPI struct patch is in there, one caveat of the new
behavior is that in drivers that conditionalize NAPI support
we can't be lazy and do the napi_{enable,disable}() outside
of the ifdefs any longer. I tried to audit all the drivers
but I might have missed a few.
tg3, 8139cp and e100 are known to be tested at least minimally with
the new code.
The only remaining fundamental bug in the NAPI bits is the
issue wrt. who manages the NAPI list insertion and removal.
It needs to be changed such that only the entity who transitions
the STATE_SCHED napi bit does the list add/del.
Ironically this is what Olaf Kirch was trying to do to fix the
netpoll races a few weeks ago.
This also pulls in John Linville's latest 80211 stack from
this afternoon as well as a bunch of other stuff posted recently.
kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.24.git
Enjoy.
-
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-2.6.24 rebased
On Tue, 2007-08-28 at 17:25 -0700, David Miller wrote:
The new NAPI struct patch is in there, one caveat of the new
behavior is that in drivers that conditionalize NAPI support
we can't be lazy and do the napi_{enable,disable}() outside
of the ifdefs any longer. I tried to audit all the drivers
but I might have missed a few.
tg3, 8139cp and e100 are known to be tested at least minimally with
the new code.
It seems that tg3 and bnx2 still have the tx locking changes. David,
didn't you revert those changes a few weeks ago?
-
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-2.6.24 rebased
From: Michael Chan [EMAIL PROTECTED] Date: Tue, 28 Aug 2007 18:33:19 -0700 It seems that tg3 and bnx2 still have the tx locking changes. David, didn't you revert those changes a few weeks ago? I could have sworn I did, thanks for catching that I'll fix it 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: net-2.6.24 rebased
From: David Miller [EMAIL PROTECTED] Date: Tue, 28 Aug 2007 17:54:04 -0700 (PDT) I could have sworn I did, thanks for catching that I'll fix it up. I pushed this fix into net-2.6.24 just now, thanks again. - 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
net-2.6.24 rebased
I needed to pull out the xfrm auditing patch, and I had been meaning to combine the NAPI struct patch with all the little bug fixes we've accumulated. Also, as mentioned here throughout the day, I've also added Thomas Graf's xfrm_user cleanups and Stephen Hemminger's netdevice docbook additions. Enjoy. - 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
