* Re: [net-2.6 PATCH] ixgbe: fix bug with vlan strip in promsic mode
From: David Miller @ 2010-04-13 8:57 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, jesse.brandeburg
In-Reply-To: <1271108409.23823.0.camel@localhost>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Mon, 12 Apr 2010 14:40:09 -0700
> On Fri, 2010-03-26 at 22:00 -0600, David Miller wrote:
>> Doesn't apply.
>>
>> It depends upon the mc_list traversal conversions which are
>> absolutely not appropriate for net-2.6, and thus I only
>> applied to net-next-2.6
>
> I am not seeing this patch in your net-next tree.
Even stranger I can't even find it in patchwork either.
> Do you want me to re-submit the patch against net-next?
Please resubmit, thanks Jeff.
Sorry for this.
^ permalink raw reply
* Re: [PATCH] xtables: make XT_ALIGN() usable in exported headers by exporting __ALIGN_KERNEL()
From: Patrick McHardy @ 2010-04-13 9:22 UTC (permalink / raw)
To: Alexey Dobriyan
Cc: linux-kernel, netdev, shemminger, bhutchings, andreas, hadi,
hideaki
In-Reply-To: <20100407162245.GA4557@x200>
Alexey Dobriyan wrote:
> XT_ALIGN() was rewritten through ALIGN() by commit 42107f5009da223daa800d6da6904d77297ae829
> "netfilter: xtables: symmetric COMPAT_XT_ALIGN definition".
> ALIGN() is not exported in userspace headers, which created compile problem for tc(8)
> and will create problem for iptables(8).
>
> We can't export generic looking name ALIGN() but we can export less generic
> __ALIGN_KERNEL() (suggested by Ben Hutchings).
> Google knows nothing about __ALIGN_KERNEL().
>
> COMPAT_XT_ALIGN() changed for symmetry.
Since there haven't been any objections, I've applied your patch.
Thanks.
^ permalink raw reply
* Re: [PATCH net-next 0/8] tg3 updates
From: David Miller @ 2010-04-13 9:26 UTC (permalink / raw)
To: mcarlson; +Cc: netdev, andy
In-Reply-To: <1271091511-11173-1-git-send-email-mcarlson@broadcom.com>
From: "Matt Carlson" <mcarlson@broadcom.com>
Date: Mon, 12 Apr 2010 09:58:23 -0700
> This patchset adds code to support the 57765 OTP ROM bootcode, fixes
> bug related to VLANs and adds some minor improvements.
These all look good, applied to net-next-2.6
Thanks!
^ permalink raw reply
* Re: [PATCH 0/4] IPv6 addrconf related fixes
From: David Miller @ 2010-04-13 9:29 UTC (permalink / raw)
To: shemminger; +Cc: netdev
In-Reply-To: <20100412154130.397252857@vyatta.com>
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Mon, 12 Apr 2010 08:41:30 -0700
> These apply to net-next, the problems do not exist in earlier kernels.
> The problems started when I added changes to retain IPv6 addresses
> when link goes down.
All aplied, thanks for fixing these bugs Stephen.
^ permalink raw reply
* Re: Flooded with bonding: bond0: doing slave updates when interface is down.
From: gopala krishnan @ 2010-04-13 7:55 UTC (permalink / raw)
To: netdev
In-Reply-To: <87mxzj6eyx.fsf@tac.ki.iif.hu>
Hi I have a question,
Before adding a slave to a bond, is it we require to mave the slave interface
down and add the slave to the bond and make the slave up.
Then the traffic will be disruptive when adding a slave to the bond.
^ permalink raw reply
* Re: [PATCH v2] net: batch skb dequeueing from softnet input_pkt_queue
From: Changli Gao @ 2010-04-13 9:50 UTC (permalink / raw)
To: Eric Dumazet; +Cc: David S. Miller, netdev
In-Reply-To: <1271146112.16881.213.camel@edumazet-laptop>
On Tue, Apr 13, 2010 at 4:08 PM, Eric Dumazet <eric.dumazet@gmail.com> wrote:
>
> Probably not necessary.
>
>> + volatile bool flush_processing_queue;
>
> Use of 'volatile' is strongly discouraged, I would say, forbidden.
>
volatile is used to avoid compiler optimization.
> Its usually a sign of 'I dont exactly what memory ordering I need, so I
> throw a volatile just in case'. We live in a world full of RCU, read ,
> write, full barriers. And these apis are well documented.
>
There isn't memory accessing order problem.
>> @@ -2803,6 +2808,7 @@ static void flush_backlog(void *arg)
>> __skb_unlink(skb, &queue->input_pkt_queue);
>> kfree_skb(skb);
>> }
>> + queue->flush_processing_queue = true;
>
> Probably not necessary
>
If flush_backlog() is called when there are still packets in
processing_queue, there maybe some packets refer to the netdev gone,
if we remove this line.
>> rps_unlock(queue);
>> }
>>
>> @@ -3112,14 +3118,23 @@ static int process_backlog(struct napi_struct *napi, int quota)
>> struct softnet_data *queue = &__get_cpu_var(softnet_data);
>> unsigned long start_time = jiffies;
>>
>> + if (queue->flush_processing_queue) {
>
> Really... this is bloat IMHO
Any better idea?
>
>>
>
> I advise to keep it simple.
>
> My suggestion would be to limit this patch only to process_backlog().
>
> Really if you touch other areas, there is too much risk.
>
> Perform sort of skb_queue_splice_tail_init() into a local (stack) queue,
> but the trick is to not touch input_pkt_queue.qlen, so that we dont slow
> down enqueue_to_backlog().
>
> Process at most 'quota' skbs (or jiffies limit).
>
> relock queue.
> input_pkt_queue.qlen -= number_of_handled_skbs;
>
Oh no, in order to let latter packets in as soon as possible, we have
to update qlen immediately.
--
Regards，
Changli Gao(xiaosuo@gmail.com)
^ permalink raw reply
* Re: [PATCH] Fix some #includes in CAN drivers
From: Hans J. Koch @ 2010-04-13 9:51 UTC (permalink / raw)
To: David Miller
Cc: haas-zsNKPWJ8Piak0Ce0JJ2bFg, celston-Bm0nJX+W7e9BDgjK7y7TUQ,
netdev-u79uwXL29TY76Z2rM5mHXA,
socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
per.dalen-Re5JQEeQqe8AvxtiuMwx3w,
oliver.hartkopp-l29pVbxQd1IUtdQbppsyvg,
kernel-bIcnvbaLZ9MEGnE8C9+IrQ, wg-5Yr1BZd7O62+XT7JhA+gdA,
chripell-LERDrqjqfvZg9hUCZPvPmw
In-Reply-To: <20100413.013614.200995710.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
On Tue, Apr 13, 2010 at 01:36:14AM -0700, David Miller wrote:
> From: "Hans J. Koch" <hjk-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
> Date: Thu, 8 Apr 2010 21:25:45 +0200
>
> > In the current implementation, CAN drivers need to #include <linux/can.h>
> > _before_ they #include <linux/can/dev.h>, which is both ugly and
> > unnecessary.
> >
> > Fix this by including <linux/can.h> in <linux/can/dev.h> and remove the
> > #include <linux/can.h> lines from drivers.
> >
> > Signed-off-by: Hans J. Koch <hjk-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
>
> This doesn't apply cleanly to net-next-2.6, please respin your patch
> and resubmit.
Ooops, sorry. Will resubmit immediately.
Thanks,
Hans
^ permalink raw reply
* Re: [PATCH] tg3: use the DMA state API instead of the pci equivalents
From: David Miller @ 2010-04-13 9:54 UTC (permalink / raw)
To: fujita.tomonori; +Cc: netdev, mcarlson, mchan
In-Reply-To: <1271118734-28353-1-git-send-email-fujita.tomonori@lab.ntt.co.jp>
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 13 Apr 2010 09:32:09 +0900
> This replace the PCI DMA state API (include/linux/pci-dma.h) with the
> DMA equivalents since the PCI DMA state API will be obsolete.
>
> No functional change.
>
> For further information about the background:
>
> http://marc.info/?l=linux-netdev&m=127037540020276&w=2
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Applied.
^ permalink raw reply
* Re: [PATCH] qla3xxx: use the DMA state API instead of the pci equivalents
From: David Miller @ 2010-04-13 9:54 UTC (permalink / raw)
To: fujita.tomonori; +Cc: netdev, ron.mercer
In-Reply-To: <1271118734-28353-5-git-send-email-fujita.tomonori@lab.ntt.co.jp>
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 13 Apr 2010 09:32:13 +0900
> This replace the PCI DMA state API (include/linux/pci-dma.h) with the
> DMA equivalents since the PCI DMA state API will be obsolete.
>
> No functional change.
>
> For further information about the background:
>
> http://marc.info/?l=linux-netdev&m=127037540020276&w=2
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Applied.
^ permalink raw reply
* Re: [PATCH] chelsio: use the DMA state API instead of the pci equivalents
From: David Miller @ 2010-04-13 9:54 UTC (permalink / raw)
To: fujita.tomonori; +Cc: netdev, divy
In-Reply-To: <1271118734-28353-3-git-send-email-fujita.tomonori@lab.ntt.co.jp>
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 13 Apr 2010 09:32:11 +0900
> This replace the PCI DMA state API (include/linux/pci-dma.h) with the
> DMA equivalents since the PCI DMA state API will be obsolete.
>
> No functional change.
>
> For further information about the background:
>
> http://marc.info/?l=linux-netdev&m=127037540020276&w=2
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Applied.
^ permalink raw reply
* Re: [PATCH] cxgb3: use the DMA state API instead of the pci equivalents
From: David Miller @ 2010-04-13 9:54 UTC (permalink / raw)
To: fujita.tomonori; +Cc: netdev, divy
In-Reply-To: <1271118734-28353-4-git-send-email-fujita.tomonori@lab.ntt.co.jp>
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 13 Apr 2010 09:32:12 +0900
> This replace the PCI DMA state API (include/linux/pci-dma.h) with the
> DMA equivalents since the PCI DMA state API will be obsolete.
>
> No functional change.
>
> For further information about the background:
>
> http://marc.info/?l=linux-netdev&m=127037540020276&w=2
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Applied.
^ permalink raw reply
* Re: [PATCH] qlge: use the DMA state API instead of the pci equivalents
From: David Miller @ 2010-04-13 9:54 UTC (permalink / raw)
To: fujita.tomonori; +Cc: netdev, ron.mercer
In-Reply-To: <1271118734-28353-6-git-send-email-fujita.tomonori@lab.ntt.co.jp>
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 13 Apr 2010 09:32:14 +0900
> This replace the PCI DMA state API (include/linux/pci-dma.h) with the
> DMA equivalents since the PCI DMA state API will be obsolete.
>
> No functional change.
>
> For further information about the background:
>
> http://marc.info/?l=linux-netdev&m=127037540020276&w=2
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Applied.
^ permalink raw reply
* Re: [PATCH] myri10ge: use the DMA state API instead of the pci equivalents
From: David Miller @ 2010-04-13 9:54 UTC (permalink / raw)
To: fujita.tomonori; +Cc: netdev, gallatin, brice
In-Reply-To: <1271118734-28353-2-git-send-email-fujita.tomonori@lab.ntt.co.jp>
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 13 Apr 2010 09:32:10 +0900
> This replace the PCI DMA state API (include/linux/pci-dma.h) with the
> DMA equivalents since the PCI DMA state API will be obsolete.
>
> No functional change.
>
> For further information about the background:
>
> http://marc.info/?l=linux-netdev&m=127037540020276&w=2
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Applied.
^ permalink raw reply
* Re: [net-next-2.6 PATCH] igb: add support for reporting 5GT/s during probe on PCIe Gen2
From: David Miller @ 2010-04-13 9:58 UTC (permalink / raw)
To: bhutchings; +Cc: jeffrey.t.kirsher, netdev, gospo, alexander.h.duyck
In-Reply-To: <1270857256.2176.37.camel@localhost>
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Sat, 10 Apr 2010 00:54:16 +0100
> On Fri, 2010-04-09 at 12:52 -0700, Jeff Kirsher wrote:
>> From: Alexander Duyck <alexander.h.duyck@intel.com>
>>
>> This change corrects the fact that we were not reporting Gen2 link speeds
>> when we were in fact connected at Gen2 rates.
>>
>> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> ---
>>
>> drivers/net/igb/e1000_defines.h | 3 +++
>> drivers/net/igb/e1000_mac.c | 19 ++++++++++++++++---
>> drivers/net/igb/igb_main.c | 1 +
>> 3 files changed, 20 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/igb/e1000_defines.h b/drivers/net/igb/e1000_defines.h
>> index 31d24e0..8e440e8 100644
>> --- a/drivers/net/igb/e1000_defines.h
>> +++ b/drivers/net/igb/e1000_defines.h
>> @@ -615,6 +615,9 @@
>>
>> #define PCIE_LINK_WIDTH_MASK 0x3F0
>> #define PCIE_LINK_WIDTH_SHIFT 4
>> +#define PCIE_LINK_SPEED_MASK 0x0F
>> +#define PCIE_LINK_SPEED_2500 0x01
>> +#define PCIE_LINK_SPEED_5000 0x02
>> #define PCIE_DEVICE_CONTROL2_16ms 0x0005
> [...]
>
> These generic definitions belong in <linux/pci_regs.h>; in fact some of
> it is already there.
Agreed, please put these in the PCI header file.
^ permalink raw reply
* Re: [net-next-2.6 PATCH] igb: modify register test for i350 to reflect read only bits in RDLEN/TDLEN
From: David Miller @ 2010-04-13 9:59 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, alexander.h.duyck
In-Reply-To: <20100409195306.30654.19260.stgit@localhost.localdomain>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 09 Apr 2010 12:53:08 -0700
> From: Alexander Duyck <alexander.h.duyck@intel.com>
>
> The registers for RDLEN/TDLEN on i350 have the first 7 bits as read only.
> This is a change from previous hardware in which it was only the first 4
> bits that were read only.
>
> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied.
^ permalink raw reply
* Re: [net-next-2.6 PATCH] skbuff: remove unused dev_consume_skb macro definition
From: David Miller @ 2010-04-13 9:59 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, alexander.h.duyck
In-Reply-To: <20100409200116.31057.29639.stgit@localhost.localdomain>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 09 Apr 2010 13:01:37 -0700
> From: Alexander Duyck <alexander.h.duyck@intel.com>
>
> dev_consume_skb and kfree_skb_clean have no users and in the case of
> kfree_skb_clean could cause potential build issues since I cannot find
> where it is defined. Based on the patch in which it was introduced it
> appears to have been a bit of leftover code from an earlier version of the
> patch in which kfree_skb_clean was dropped in favor of consume_skb.
>
> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied.
^ permalink raw reply
* Re: [net-next-2.6 PATCH] e1000e: use static params to save stack space
From: David Miller @ 2010-04-13 9:59 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, jesse.brandeburg
In-Reply-To: <20100409205044.32158.23239.stgit@localhost.localdomain>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 09 Apr 2010 13:51:09 -0700
> From: Jesse Brandeburg <jesse.brandeburg@intel.com>
>
> used a modified checkstack to get the 56 number
> (normally checkstack wouldn't show this low a value)
>
> checkstack before:
> 0x0000012f e1000e_check_options [e1000e]: 272
>
> after:
> 0x0000012f e1000e_check_options [e1000e]: 56
>
>
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied.
^ permalink raw reply
* Re: [PATCH] (net-2.6) stmmac update - Apr 2010
From: Giuseppe CAVALLARO @ 2010-04-13 10:00 UTC (permalink / raw)
To: David Miller; +Cc: netdev
In-Reply-To: <20100413.015352.223941252.davem@davemloft.net>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi David,
On 04/13/2010 10:53 AM, David Miller wrote:
> From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
> Date: Fri, 9 Apr 2010 12:24:15 +0200
>
>> Hello,
>> this is another subset of patches to make the driver more generic.
>>
>> This patches splits the dma and core code for the mac 10/100 device
>> (as already done for the gmac) and reorganizes the descriptor
>> structures.
>> In the first version of the driver, the mac10/100 could only use
>> normal descriptors and the gmac could only use the enhanced ones.
>> This limit has been removed and this kind of information comes
>> from the platform.
>
> Please:
>
> 1) respin your patches against net-next-2.6
I'll do this soon.
> 2) Add numbers to your patch posting subject lines so there
> is no confusion about what order your patches should be
> applied.
Oops! you are right. Thanks!
>
> 3) Make sure the driver compiles successfully at each step
> of applying your patches, not just after all the changes
> are applied.
Sure! I test this always.
Many thanks.
Best Regards
Giuseppe
> Thanks.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJLxECpAAoJEAm9vY9TshdvuH8H/RbUTVa+o7qJjRyXgb34h5t4
KSwdcnWwY90d2i/3zLvWlwaSn4J5zrSWc6EdXRpU/1zBI+xcQ0wAFieqF8R0QOoE
qIKliOPCJ7NrsV30J4xhe2R0q7e423vmTdUfcNB1VXqBaZOQOPZmKjApRT240c6E
CwLfTANwAQ6t8pl6rlyww/nTEPuOVx0ETvAGEfHloWa3Sr5TvgXndfD2dnDU9cs1
wgg/6YzehTRioMM3Rf7KySuVMcENbCkyy3R4zSNvwJONZqVqMkTWDZ1XIpq3BvpV
r2AAjXdXtVB2Z6lroP2UVCrYLcm3LB0WUdzTqrj0zpzW9cm1DEOb2nhjcWVLNHY=
=h25h
-----END PGP SIGNATURE-----
^ permalink raw reply
* Re: [PATCH] xtables: make XT_ALIGN() usable in exported headers by exporting __ALIGN_KERNEL()
From: Patrick McHardy @ 2010-04-13 10:01 UTC (permalink / raw)
To: Alexey Dobriyan
Cc: linux-kernel, netdev, shemminger, bhutchings, andreas, hadi,
hideaki
In-Reply-To: <4BC437C6.8020602@trash.net>
Patrick McHardy wrote:
> Alexey Dobriyan wrote:
>> XT_ALIGN() was rewritten through ALIGN() by commit 42107f5009da223daa800d6da6904d77297ae829
>> "netfilter: xtables: symmetric COMPAT_XT_ALIGN definition".
>> ALIGN() is not exported in userspace headers, which created compile problem for tc(8)
>> and will create problem for iptables(8).
>>
>> We can't export generic looking name ALIGN() but we can export less generic
>> __ALIGN_KERNEL() (suggested by Ben Hutchings).
>> Google knows nothing about __ALIGN_KERNEL().
>>
>> COMPAT_XT_ALIGN() changed for symmetry.
>
> Since there haven't been any objections, I've applied your patch.
This breaks compilation by removing __ALIGN_MASK(). Please fix this up.
^ permalink raw reply
* [PATCH - resubmit] Fix some #includes in CAN drivers (rebased for net-next-2.6)
From: Hans J. Koch @ 2010-04-13 10:03 UTC (permalink / raw)
To: netdev-u79uwXL29TY76Z2rM5mHXA
Cc: Chris Elston, Sebastian Haas,
socketcan-core-0fE9KPoRgkgATYTw5x5z8w, Per Dalen, Oliver Hartkopp,
kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Wolfgang Grandegger,
Christian Pellegrin
In the current implementation, CAN drivers need to #include <linux/can.h>
_before_ they #include <linux/can/dev.h>, which is both ugly and
unnecessary.
Fix this by including <linux/can.h> in <linux/can/dev.h> and remove the
#include <linux/can.h> lines from drivers.
Signed-off-by: Hans J. Koch <hjk-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
---
drivers/net/can/at91_can.c | 1 -
drivers/net/can/bfin_can.c | 1 -
drivers/net/can/mcp251x.c | 1 -
drivers/net/can/mscan/mpc5xxx_can.c | 1 -
drivers/net/can/mscan/mscan.c | 1 -
drivers/net/can/sja1000/ems_pci.c | 1 -
drivers/net/can/sja1000/kvaser_pci.c | 1 -
drivers/net/can/sja1000/plx_pci.c | 1 -
drivers/net/can/sja1000/sja1000.c | 1 -
drivers/net/can/sja1000/sja1000_isa.c | 1 -
drivers/net/can/sja1000/sja1000_of_platform.c | 1 -
drivers/net/can/sja1000/sja1000_platform.c | 1 -
drivers/net/can/ti_hecc.c | 1 -
include/linux/can/dev.h | 1 +
14 files changed, 1 insertion(+), 13 deletions(-)
Index: net-next-2.6/include/linux/can/dev.h
===================================================================
--- net-next-2.6.orig/include/linux/can/dev.h 2010-04-13 11:27:39.000000000 +0200
+++ net-next-2.6/include/linux/can/dev.h 2010-04-13 11:31:57.000000000 +0200
@@ -14,6 +14,7 @@
#ifndef CAN_DEV_H
#define CAN_DEV_H
+#include <linux/can.h>
#include <linux/can/netlink.h>
#include <linux/can/error.h>
Index: net-next-2.6/drivers/net/can/at91_can.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/at91_can.c 2010-04-13 11:27:33.000000000 +0200
+++ net-next-2.6/drivers/net/can/at91_can.c 2010-04-13 11:31:57.000000000 +0200
@@ -35,7 +35,6 @@
#include <linux/string.h>
#include <linux/types.h>
-#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/can/error.h>
Index: net-next-2.6/drivers/net/can/bfin_can.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/bfin_can.c 2010-04-13 11:27:33.000000000 +0200
+++ net-next-2.6/drivers/net/can/bfin_can.c 2010-04-13 11:31:57.000000000 +0200
@@ -18,7 +18,6 @@
#include <linux/skbuff.h>
#include <linux/platform_device.h>
-#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/can/error.h>
Index: net-next-2.6/drivers/net/can/mcp251x.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/mcp251x.c 2010-04-13 11:27:33.000000000 +0200
+++ net-next-2.6/drivers/net/can/mcp251x.c 2010-04-13 11:31:57.000000000 +0200
@@ -58,7 +58,6 @@
*
*/
-#include <linux/can.h>
#include <linux/can/core.h>
#include <linux/can/dev.h>
#include <linux/can/platform/mcp251x.h>
Index: net-next-2.6/drivers/net/can/ti_hecc.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/ti_hecc.c 2010-04-13 11:27:33.000000000 +0200
+++ net-next-2.6/drivers/net/can/ti_hecc.c 2010-04-13 11:31:57.000000000 +0200
@@ -47,7 +47,6 @@
#include <linux/platform_device.h>
#include <linux/clk.h>
-#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/can/error.h>
#include <linux/can/platform/ti_hecc.h>
Index: net-next-2.6/drivers/net/can/mscan/mpc5xxx_can.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/mscan/mpc5xxx_can.c 2010-04-13 11:27:33.000000000 +0200
+++ net-next-2.6/drivers/net/can/mscan/mpc5xxx_can.c 2010-04-13 11:31:57.000000000 +0200
@@ -25,7 +25,6 @@
#include <linux/interrupt.h>
#include <linux/platform_device.h>
#include <linux/netdevice.h>
-#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/of_platform.h>
#include <sysdev/fsl_soc.h>
Index: net-next-2.6/drivers/net/can/mscan/mscan.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/mscan/mscan.c 2010-04-13 11:27:33.000000000 +0200
+++ net-next-2.6/drivers/net/can/mscan/mscan.c 2010-04-13 11:31:57.000000000 +0200
@@ -28,7 +28,6 @@
#include <linux/if_arp.h>
#include <linux/if_ether.h>
#include <linux/list.h>
-#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/can/error.h>
#include <linux/io.h>
Index: net-next-2.6/drivers/net/can/sja1000/ems_pci.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/sja1000/ems_pci.c 2010-04-13 11:27:33.000000000 +0200
+++ net-next-2.6/drivers/net/can/sja1000/ems_pci.c 2010-04-13 11:31:57.000000000 +0200
@@ -24,7 +24,6 @@
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/pci.h>
-#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/io.h>
Index: net-next-2.6/drivers/net/can/sja1000/kvaser_pci.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/sja1000/kvaser_pci.c 2010-04-13 11:27:33.000000000 +0200
+++ net-next-2.6/drivers/net/can/sja1000/kvaser_pci.c 2010-04-13 11:31:57.000000000 +0200
@@ -36,7 +36,6 @@
#include <linux/netdevice.h>
#include <linux/delay.h>
#include <linux/pci.h>
-#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/io.h>
Index: net-next-2.6/drivers/net/can/sja1000/plx_pci.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/sja1000/plx_pci.c 2010-04-13 11:27:33.000000000 +0200
+++ net-next-2.6/drivers/net/can/sja1000/plx_pci.c 2010-04-13 11:31:57.000000000 +0200
@@ -27,7 +27,6 @@
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/pci.h>
-#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/io.h>
Index: net-next-2.6/drivers/net/can/sja1000/sja1000.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/sja1000/sja1000.c 2010-04-13 11:27:33.000000000 +0200
+++ net-next-2.6/drivers/net/can/sja1000/sja1000.c 2010-04-13 11:31:57.000000000 +0200
@@ -60,7 +60,6 @@
#include <linux/skbuff.h>
#include <linux/delay.h>
-#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/can/error.h>
Index: net-next-2.6/drivers/net/can/sja1000/sja1000_isa.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/sja1000/sja1000_isa.c 2010-04-13 11:27:33.000000000 +0200
+++ net-next-2.6/drivers/net/can/sja1000/sja1000_isa.c 2010-04-13 11:31:57.000000000 +0200
@@ -23,7 +23,6 @@
#include <linux/delay.h>
#include <linux/irq.h>
#include <linux/io.h>
-#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/can/platform/sja1000.h>
Index: net-next-2.6/drivers/net/can/sja1000/sja1000_of_platform.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/sja1000/sja1000_of_platform.c 2010-04-13 11:27:33.000000000 +0200
+++ net-next-2.6/drivers/net/can/sja1000/sja1000_of_platform.c 2010-04-13 11:31:57.000000000 +0200
@@ -38,7 +38,6 @@
#include <linux/interrupt.h>
#include <linux/netdevice.h>
#include <linux/delay.h>
-#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/of_platform.h>
Index: net-next-2.6/drivers/net/can/sja1000/sja1000_platform.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/sja1000/sja1000_platform.c 2010-04-13 11:27:33.000000000 +0200
+++ net-next-2.6/drivers/net/can/sja1000/sja1000_platform.c 2010-04-13 11:31:57.000000000 +0200
@@ -24,7 +24,6 @@
#include <linux/pci.h>
#include <linux/platform_device.h>
#include <linux/irq.h>
-#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/can/platform/sja1000.h>
#include <linux/io.h>
^ permalink raw reply
* Re: forcedeth driver hangs under heavy load
From: stephen mulcahy @ 2010-04-13 10:03 UTC (permalink / raw)
To: Eric Dumazet; +Cc: netdev, Ben Hutchings, Ayaz Abdulla, 572201
In-Reply-To: <1271091581.16881.41.camel@edumazet-laptop>
Eric Dumazet wrote:
> OK it seems forcedeth has problem with checksums ?
>
> Try to change "ethtool -k eth0" settings ?
>
> ethtool -K eth0 tso off tx off
Yes, that makes an unresponsive system responsive again immediately, nice!
Should the driver default to disabling this until we problem is corrected?
-stephen
^ permalink raw reply
* [PATCH net-next-2.6] chelsio: Fix build warning.
From: David Miller @ 2010-04-13 10:08 UTC (permalink / raw)
To: netdev
GCC warns that:
drivers/net/chelsio/sge.c:463:11: warning: operation on 's->port' may be undefined
Better to eliminate the side effects in the calculation and
express what was intended here.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/net/chelsio/sge.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 475304f..a8ffc1e 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -460,7 +460,7 @@ static struct sk_buff *sched_skb(struct sge *sge, struct sk_buff *skb,
again:
for (i = 0; i < MAX_NPORTS; i++) {
- s->port = ++s->port & (MAX_NPORTS - 1);
+ s->port = (s->port + 1) & (MAX_NPORTS - 1);
skbq = &s->p[s->port].skbq;
skb = skb_peek(skbq);
--
1.7.0.4
^ permalink raw reply related
* Re: [net-2.6 PATCH] igb: restrict WoL for 82576 ET2 Quad Port Server Adapter
From: David Miller @ 2010-04-13 10:09 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann, alexander.h.duyck
In-Reply-To: <20100409195029.30616.21221.stgit@localhost.localdomain>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 09 Apr 2010 12:51:34 -0700
> From: Stefan Assmann <sassmann@redhat.com>
>
> Restrict Wake-on-LAN to first port on 82576 ET2 quad port NICs, as it is
> only supported there.
>
> Signed-off-by: Stefan Assmann <sassmann@redhat.com>
> Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied.
^ permalink raw reply
* Re: [net-2.6 PATCH] e1000e: stop cleaning when we reach tx_ring->next_to_use
From: David Miller @ 2010-04-13 10:09 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, terry.loftin, bruce.w.allan
In-Reply-To: <20100409202917.31293.79618.stgit@localhost.localdomain>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 09 Apr 2010 13:29:49 -0700
> From: Terry Loftin <terry.loftin@hp.com>
>
> Tx ring buffers after tx_ring->next_to_use are volatile and could
> change, possibly causing a crash. Stop cleaning when we hit
> tx_ring->next_to_use.
>
> Signed-off-by: Terry Loftin <terry.loftin@hp.com>
> Acked-by: Bruce Allan <bruce.w.allan@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied.
^ permalink raw reply
* Re: Linux 2.6.34-rc3 + CAN build problem
From: David Miller @ 2010-04-13 10:09 UTC (permalink / raw)
To: eric.dumazet
Cc: nm127, socketcan, oliver.hartkopp, urs.thuermann, socketcan-core,
netdev, linux-kernel
In-Reply-To: <1270892851.2093.32.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 10 Apr 2010 11:47:31 +0200
> [PATCH] can: avoids a false warning
>
> At this point optlen == sizeof(sfilter) but some compilers are dumb.
>
> Reported-by: Németh Márton <nm127@freemail.h
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied, thanks Eric.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox