Re: net-2.6.24 rebased...

2007-10-10 Thread Oliver Hartkopp
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 releas

Re: net-2.6.24 rebased...

2007-10-09 Thread David Miller
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

Re: net-2.6.24 rebased...

2007-10-09 Thread Urs Thuermann
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

net-2.6.24 rebased...

2007-10-09 Thread David Miller
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

net-2.6.24 rebased

2007-10-03 Thread David Miller
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 w

Re: net-2.6.24 rebased...

2007-09-26 Thread David Miller
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: > >

Re: net-2.6.24 rebased...

2007-09-26 Thread John W. Linville
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 probabl

Re: net-2.6.24 rebased...

2007-09-26 Thread Johannes Berg
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

net-2.6.24 rebased...

2007-09-25 Thread David Miller
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

net-2.6.24 rebased

2007-09-06 Thread David Miller
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 change

Re: net-2.6.24 rebased

2007-08-31 Thread David Miller
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

Re: net-2.6.24 rebased

2007-08-31 Thread John W. Linville
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_H

Re: net-2.6.24 rebased

2007-08-30 Thread David Miller
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 an

Re: net-2.6.24 rebased

2007-08-30 Thread Johannes Berg
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) > drive

Re: net-2.6.24 rebased

2007-08-29 Thread Joe Perches
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

Re: net-2.6.24 rebased

2007-08-29 Thread Joe Perches
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

Re: net-2.6.24 rebased

2007-08-28 Thread David Miller
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

Re: net-2.6.24 rebased

2007-08-28 Thread David Miller
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 l

Re: net-2.6.24 rebased

2007-08-28 Thread Michael Chan
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 dr

net-2.6.24 rebased

2007-08-28 Thread David Miller
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

net-2.6.24 rebased

2007-08-22 Thread David Miller
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.