Commit 402168ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (37 commits)
  sky2: Avoid races in sky2_down
  drivers/net/mlx4: Adjust constant
  drivers/net: Move a dereference below a NULL test
  drivers/net: Move a dereference below a NULL test
  connector: maintainer/mail update.
  USB host CDC Phonet network interface driver
  macsonic, jazzsonic: fix oops on module unload
  macsonic: move probe function to .devinit.text
  can: switch carrier on if device was stopped while in bus-off state
  can: restart device even if dev_alloc_skb() fails
  can: sja1000: remove duplicated includes
  New device ID for sc92031 [1088:2031]
  3c589_cs: re-initialize the multicast in the tc589_reset
  Fix error return for setsockopt(SO_TIMESTAMPING)
  netxen: fix thermal check and shutdown
  netxen: fix deadlock on dev close
  netxen: fix context deletion sequence
  net: Micrel KS8851 SPI network driver
  tcp: Use correct peer adr when copying MD5 keys
  tcp: Fix MD5 signature checking on IPv4 mapped sockets
  ...
parents 12e8ffe3 a947a39d

CREDITS

+1 −1
Original line number Diff line number Diff line
@@ -1856,7 +1856,7 @@ E: rfkoenig@immd4.informatik.uni-erlangen.de 
D: The Linux Support Team Erlangen



N: Andreas Koensgen

E: ajk@iehk.rwth-aachen.de

E: ajk@comnets.uni-bremen.de

D: 6pack driver for AX.25



N: Harald Koerfgen

Documentation/RCU/rculist_nulls.txt

+6 −1
Original line number Diff line number Diff line
@@ -83,11 +83,12 @@ not detect it missed following items in original chain. 
obj = kmem_cache_alloc(...);

lock_chain(); // typically a spin_lock()

obj->key = key;

atomic_inc(&obj->refcnt);

/*

 * we need to make sure obj->key is updated before obj->next

 * or obj->refcnt

 */

smp_wmb();

atomic_set(&obj->refcnt, 1);

hlist_add_head_rcu(&obj->obj_node, list);

unlock_chain(); // typically a spin_unlock()
@@ -159,6 +160,10 @@ out: 
obj = kmem_cache_alloc(cachep);

lock_chain(); // typically a spin_lock()

obj->key = key;

/*

 * changes to obj->key must be visible before refcnt one

 */

smp_wmb();

atomic_set(&obj->refcnt, 1);

/*

 * insert obj in RCU way (readers might be traversing chain)

Documentation/connector/cn_test.c

+2 −2
Original line number Diff line number Diff line 
/*

 * 	cn_test.c

 * 

 * 2004-2005 Copyright (c) Evgeniy Polyakov <johnpol@2ka.mipt.ru>

 * 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>

 * All rights reserved.

 * 

 * This program is free software; you can redistribute it and/or modify
@@ -194,5 +194,5 @@ module_init(cn_test_init); 
module_exit(cn_test_fini);



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");

MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>");

MODULE_DESCRIPTION("Connector's test module");

Documentation/connector/ucon.c

+1 −1
Original line number Diff line number Diff line 
/*

 * 	ucon.c

 *

 * Copyright (c) 2004+ Evgeniy Polyakov <johnpol@2ka.mipt.ru>

 * Copyright (c) 2004+ Evgeniy Polyakov <zbr@ioremap.net>

 *

 *

 * This program is free software; you can redistribute it and/or modify

Documentation/networking/6pack.txt

+1 −1
Original line number Diff line number Diff line 
This is the 6pack-mini-HOWTO, written by



Andreas Könsgen DG3KQ

Internet: ajk@iehk.rwth-aachen.de

Internet: ajk@comnets.uni-bremen.de

AMPR-net: dg3kq@db0pra.ampr.org

AX.25:    dg3kq@db0ach.#nrw.deu.eu

CRA Git | Maintained and supported by SUSTech CRA and CCSE