The 82537 errata and comment in e1000e_disable_l1aspm both agree that only 82537L devices are affected. Limit the L1 disable to them. Signed-off-by: Matthew Garrett <mjg@redhat.com> --- drivers/net/e1000e/netdev.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 57f149b..27eed81 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -4642,6 +4642,10 @@ static void ...

Some logging messages duplicate the driver name with the device name like: ATL1E 0000:03:00.0: ATL1E: eth0 NIC Link is Up<100 Mbps Full Duplex> Some drivers/net/... have created netif_ macros like: drivers/net/sis190.c:#define net_drv(p, arg...) if (netif_msg_drv(p)) \ drivers/net/sis190.c- printk(arg) drivers/net/sis190.c:#define net_probe(p, arg...) if (netif_msg_probe(p)) \ drivers/net/sis190.c- printk(arg) drivers/net/sis190.c:#define net_link(p, arg...) if (netif_msg_link(p)) ...

Signed-off-by: Joe Perches <joe@perches.com> --- drivers/net/skge.c | 73 ++++++++++++++++++++------------------------------- 1 files changed, 29 insertions(+), 44 deletions(-) diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 5ff46eb..d65138e 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c @@ -1074,13 +1074,11 @@ static void skge_link_up(struct skge_port *skge) netif_carrier_on(skge->netdev); netif_wake_queue(skge->netdev); - if (netif_msg_link(skge)) ...

Logging messages sometimes had duplicated "ATL1E" output. For instance: ATL1E 0000:03:00.0: ATL1E: eth0 NIC Link is Up<100 Mbps Full Duplex> is now: ATL1E 0000:03:00.0: eth0: NIC Link is Up <100 Mbps Full Duplex> Add some consistency to logging messages Add some missing \n's to logging messages Miscellaneous typo spelling corrections Change atl1e_validate_option argument from pdev to adapter Signed-off-by: Joe Perches <joe@perches.com> --- drivers/net/atl1e/atl1e_hw.c | 23 ...

Convert uses of msg_<type> to netif_<level>( Remove msg_<type> macros Signed-off-by: Joe Perches <joe@perches.com> --- drivers/net/jme.c | 54 ++++++++++++++++++++++++++-------------------------- drivers/net/jme.h | 41 ++++++--------------------------------- 2 files changed, 34 insertions(+), 61 deletions(-) diff --git a/drivers/net/jme.c b/drivers/net/jme.c index 26eed49..282a968 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c @@ -288,7 +288,7 @@ jme_set_rx_pcc(struct ...

This patch set adds checkpoint/restart support for network namespaces, as well as the network devices within. Currently supports veth and loopback device types. Major changes from last time[1] are: - Add a per-device ndo_checkpoint() operation which simultaneously isolates the checkpoint layer from the network device's checkpoint function and internal data, and also provides a better way to determine checkpointability of a given interface. - Use RTNL to create the veth pair as ...

Adds an ndo_checkpoint() handler for veth devices to checkpoint themselves. Writes out the pairing information, addresses, and initiates a checkpoint on the peer if the peer won't be reached from another netns. Throws an error of our peer's netns isn't already in the hash (i.e., a tree leak). Signed-off-by: Dan Smith <danms@us.ibm.com> --- drivers/net/veth.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git ...

Adds a small ndo_checkpoint() handler for loopback devices to write the name and addresses like other interfaces. Signed-off-by: Dan Smith <danms@us.ibm.com> --- drivers/net/loopback.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 38 insertions(+), 3 deletions(-) diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index b9fcc98..816a527 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -57,6 +57,8 @@ #include <linux/ip.h> #include ...

Hi John, Sorry If I'm painting bike-sheds here, just one tiny tweak might be in Can this be better expressed like this: my_func() { mutex_lock() .. if(some error) { rc=-ETIMEDOUT; goto out_unlock; } ... /* success path */ rc=0; .. out_unlock: mutex_unlock() return rc; } Is this style still favoured in driver exit paths? Thanks, John -- John Williams, PhD, B.Eng, B.IT PetaLogix - Linux Solutions for a Reconfigurable World w: ...

It looks to me like the mutex is not needed in the driver mdio functions as there's a mutex in the mdiobus functions already. Am I wrong about that? Thanks, John From phy/mdio_bus.c int mdiobus_read(struct mii_bus *bus, int addr, u16 regnum) { int retval; BUG_ON(in_interrupt()); mutex_lock(&bus->mdio_lock); retval = bus->read(bus, addr, regnum); mutex_unlock(&bus->mdio_lock); return retval; } EXPORT_SYMBOL(mdiobus_read); int mdiobus_write(struct mii_bus *bus, int ...

From: Steve Hodgson <shodgson@solarflare.com> Commit 357d46a17e54c9a87e0e6ef3930ff4ab2d232b81 "sfc: QT202x: Remove unreliable MMD check at initialisation" broke initialisation of the SFE4002. efx_mdio_reset_mmd() returns a positive value rather than 0 on success. The above commit causes this value to be propagated up by qt202x_reset_phy(), which is treated as a failure by its callers. Change qt202x_reset_phy() to return 0 if successful. The PCI layer treats >0 as "fail, but please call ...

Manao ahoana, Hello, Bonjour, Where is the right mailing list for discussing 'tc' usage? Misaotra, Thanks, Merci. -- Architecte Informatique chez Blueline/Gulfsat: Administration Systeme, Recherche & Developpement +261 34 29 155 34 / +261 33 11 207 36 --

Since the driver is supporting multiple generations of the ASIC remove ASIC generation information from the driver description. This information is displayed by modinfo. Signed-off-by: Ajit Khaparde <ajitk@serverengines.com> --- drivers/net/benet/be.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index 476a5c4..b39b385 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h @@ -38,7 +38,7 @@ #define ...

Couple of code optimizations in the Rx path (to avoid a memset). From: Sathya P <sathyap@serverengines.com> Signed-off-by: Ajit Khaparde <ajitk@serverengines.com> --- drivers/net/benet/be_main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index f1136a3..107de6d 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -635,9 +635,11 @@ get_rx_page_info(struct be_adapter ...

Now flashing both BE2 and BE3 devices is supported. From: Naresh G <nareshg@serverengines.com> Signed-off-by: Ajit Khaparde <ajitk@serverengines.com> --- drivers/net/benet/be_cmds.c | 9 +- drivers/net/benet/be_cmds.h | 3 +- drivers/net/benet/be_hw.h | 119 +++++++++++++++------- drivers/net/benet/be_main.c | 239 +++++++++++++++++++++++-------------------- 4 files changed, 217 insertions(+), 153 deletions(-) diff --git a/drivers/net/benet/be_cmds.c ...

[...] netdev only deals with recent 2.6 kernels. I'm amazed that Intel still wastes time on 2.4. Ben. -- Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked. --

This patchset introduces seq_hlist_foo() helpers, and convert net/* to seq_hlist_foo() and seq_list_foo(). Changelog: - Add kerneldoc in patch 1/13 - Fix compile warning in patch 11/13 - Fix a bug in patch 12/13 --- fs/seq_file.c | 60 ++++++++++++++++++++- include/linux/seq_file.h | 11 ++++ include/net/sock.h | 5 ++ net/appletalk/atalk_proc.c | 30 +---------- net/atm/proc.c | 2 +- net/atm/resources.c | 28 ...

Simplify seq_file code. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> --- net/packet/af_packet.c | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 0f6bf59..256de26 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2374,33 +2374,19 @@ static struct notifier_block packet_netdev_notifier = { }; #ifdef CONFIG_PROC_FS -static inline struct sock *packet_seq_idx(struct net ...

Simplify seq_file code. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> --- net/key/af_key.c | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-) diff --git a/net/key/af_key.c b/net/key/af_key.c index 76fa6fe..cb006b6 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -3655,9 +3655,8 @@ static const struct net_proto_family pfkey_family_ops = { #ifdef CONFIG_PROC_FS static int pfkey_seq_show(struct seq_file *f, void *v) { - struct sock *s; + struct sock ...

Some places in kernel need to iterate over a hlist in seq_file, so provide some common helpers. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> --- fs/seq_file.c | 60 +++++++++++++++++++++++++++++++++++++++++++-- include/linux/seq_file.h | 11 ++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/fs/seq_file.c b/fs/seq_file.c index eae7d9d..ff91aef 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -674,7 +674,6 @@ struct list_head *seq_list_start(struct ...

Simplify seq_file code. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> --- net/netrom/af_netrom.c | 21 ++---------------- net/netrom/nr_route.c | 53 ++++++++--------------------------------------- 2 files changed, 12 insertions(+), 62 deletions(-) diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 71604c6..a249127 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -1267,28 +1267,13 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, ...

Simplify seq_file code. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> --- net/rose/af_rose.c | 22 +++------------------- 1 files changed, 3 insertions(+), 19 deletions(-) diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 8feb9e5..e90b9b6 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -1404,29 +1404,13 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) static void *rose_info_start(struct seq_file *seq, loff_t *pos) ...

Simplify seq_file code. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> --- net/x25/x25_proc.c | 84 +++++----------------------------------------------- 1 files changed, 8 insertions(+), 76 deletions(-) diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c index c4cd322..7ff3737 100644 --- a/net/x25/x25_proc.c +++ b/net/x25/x25_proc.c @@ -25,49 +25,17 @@ #include <net/x25.h> #ifdef CONFIG_PROC_FS -static __inline__ struct x25_route *x25_get_route_idx(loff_t pos) -{ - struct ...

Most notable bits here are the netfilter conntack namespace fixes, and the sky2 DMA mapping leak fix. 1) Bluetooth fixes from Marcel Holtmann and co. a) Missing kfree() leads to leak b) Double put on RFCOMM sockets c) Handle SCO 0x1a errors (Unsupported Remote Feature) d) Fix user copy outside of proper context e) RFCOMM sleeping in invalid context 2) dst_gc() needs to preempt, fix from Eric Dumazet. 3) Netxen fixes (tx timeout adjustment for NX2031, protect ...

What about addrconf_del_timer()? It didn't seem to make it to this else{} from the original. -Brian --

Don't need to disable bottom half it is already down in the previous lock. Move some blank lines to group locking in same context. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> --- a/net/ipv6/addrconf.c 2010-02-08 21:37:31.589584963 -0800 +++ b/net/ipv6/addrconf.c 2010-02-08 21:37:41.114027790 -0800 @@ -2802,14 +2802,14 @@ static void addrconf_dad_start(struct in read_lock_bh(&idev->lock); if (ifp->dead) goto out; - spin_lock_bh(&ifp->lock); + spin_lock(&ifp->lock); ...

The offset to read the eeprom data was missing and wrong eeprom data was being dumped. This patch fixes this. From Suresh R <sureshr@serverengines.com> Signed-off-by: Ajit Khaparde <ajitk@serverengines.com> --- drivers/net/benet/be_ethtool.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c index 09d8899..dcc7f37 100644 --- a/drivers/net/benet/be_ethtool.c +++ b/drivers/net/benet/be_ethtool.c @@ -614,7 ...

Maybe it would make sense to pull the wireless trees _before_ the greater net trees? That way you can get the benefit of my merge conflict resolutions automatically. John -- John W. Linville                Someday the world will need a hero, and you linville@tuxdriver.com                  might be all we have.  Be ready. --

From: Divy Le Ray <divy@chelsio.com> Applied, thanks. --

Yes - i make bugreport and after i write also here on the list And Eric Dumazet help to solve problem with "route cache" - and locking load on one cpu after information about "route cache disabled". After his patch i don't see any errors in dmesg. But i think there is a little more in my bugreport on bugzilla. Regards --

I really shouldn't harass public mailing lists while running to the train. So. This happens on 2.6.32.7, and has nothing to do with bonding or vlans. Stopping early in the initramfs (before any network setup) and starting netconsole brings down the console for good. This time I ran with an IPMI SoL console: [...] [ 34.315957] sd 1:0:0:0: [sdc] Assuming drive cache: write through [ 34.354246] sd 1:0:0:0: [sdc] Attached SCSI disk (initramfs) modprobe netconsole ...

From: Patrick McHardy <kaber@trash.net> Done. --

Ah that is a good opportunity then to rebase my pending -next patches, to reduce conflicts you would have to solve when merging things after the conflict resolution. --

Hi Thanks for the feedback. As far as I can see, the check a couple of lines above the decrementation stops the icsk->icsk_backoff from being decremented if already zero. Beyond that I cannot find any more places where this situation may arise. Please correct me if I'm wrong and a boundary check is indeed warranted. Excerpt from tcp_ipv4.c ------------------ if (seq != tp->snd_una || !icsk->icsk_retransmits || !icsk->icsk_backoff) ...

Will spin V3 patch with fixes and add your ack, appreciate the help and your patience. This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. --

Who knows, it probably depends on many factors. I always run with cache enabled, because it saves cycles on moderate load. FIB_TRIE is unrelated here, if routing table is very small, it fits HASH or TRIE. Pawel hit the bug with tunables that basically enabled the cache but in a non helpful way (filling the list of busy dst). User error combined with a lazy kernel function :) Please note that conversion from softirq to workqueue, without scheduling point, might/probably use same cpu for ...

No, keventd threads are each pinned to a single CPU (kthread_bind() in start_workqueue_thread()), so dst_gc_task() gets run on the CPU which ran schedule_delayed_work() and no other. --

From: Joe Perches <joe@perches.com> Applied, thanks. --

I wouldn't call them cool actually. It is a stressful week of non-stop testing against other Bluetooth stacks and products. Also they are covered under an NDA since some companies are testing with prototypes. Regards Marcel --

From: Marcel Holtmann <marcel@holtmann.org> Man, I live in Seattle and I still never get invited to these Pulled, thanks! --

Thanks! Will fix. --

Either make this really conditional or remove it. '#if 0' is not useful. This is fairly disgusting, and surely only works for one byte order. I think you really want: in_param = cqn; and here: in_param = first_seg | (u64)order << 32; etc. etc. Ben. -- Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked. --

I think you need a wmb() *before* writing the command, so that its parameters are visible. I don't see why you would need a wmb() afterward; maybe you want mmiowb()? I also suggest you encapsulate this byte-swapping in inline functions: static inline u32 comm_read(void __iomem *addr) { return be32_to_cpu((__force __be32) __raw_readl(addr)); } static inline void comm_write(u32 val, void __iomem *addr) { __raw_writel((__force u32) cpu_to_be32(val), addr); mmiowb(); } Both ...

So, what about the patch(es)? :-) --

Isn't that "tcp_ack considers" comment like this: we have bug elsewhere in the code but workaround it here, at least for some of the cases? (I'd put it other way around: but alas, only for part of the cases.) ...It sound like that to me. What exactly is the reason why rtt shouldn't be calculated/initialized on such ACK, anything I'm missing? -- i. --

I've encountered some more problems, with various users of macvtap_file_get_queue() either calling or neglecting to call macvtap_file_put_queue() in error cases. I modified your patch so that when macvtap_file_get_queue() returns 0, it also calls rcu_read_unlock_bh(), and modified the users appropriately. This patch also incorporates my preemption fix for macvlan_count_rx(). Signed-off-by: Ed Swierk <eswierk@aristanetworks.com> --- I am also seeing this issue with ...

From: Anatolij Gustschin <agust@denx.de> That only means you would need to use a table based register address translation scheme, rather than a simple calculation. Something like: static unsigned int chip_xxx_table[] = { [GENERIC_REG_FOO] = CHIP_XXX_FOO, ... }; static u32 chip_xxx_read_reg(struct chip *p, unsigned int reg) { unsigned int reg_off = chip_xxx_table[reg]; return readl(p->regs + reg_off); } And this table can have special tokens in entries for registers which ...

Hi Stephen, Sorry to bug you again, but I still don't see this patch in your iproute2 git tree, although I see things done after it. Do I have to wait until you tag a v2.6.33? Thanks, -Brian --