David S. Miller
b26e478f8f
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
net/batman-adv/translation-table.c
net/ipv6/route.c
2011-12-16 02:11:14 -05:00
Djalal Harouni
a454daceb7
ppp: fix pptp double release_sock in pptp_bind()
...
Signed-off-by: Djalal Harouni <tixxdz@opendz.org >
Acked-by: Eric Dumazet <eric.dumazet@gmail.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
2011-12-07 13:29:04 -05:00
Eric Dumazet
2cfa5a0471
net: treewide use of RCU_INIT_POINTER
...
rcu_assign_pointer(ptr, NULL) can be safely replaced by
RCU_INIT_POINTER(ptr, NULL)
(old rcu_assign_pointer() macro was testing the NULL value and could
omit the smp_wmb(), but this had to be removed because of compiler
warnings)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
2011-11-23 18:48:19 -05:00
David S. Miller
1805b2f048
Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2011-10-24 18:18:09 -04:00
Jeff Kirsher
224cf5ad14
ppp: Move the PPP drivers
...
Move the PPP drivers into drivers/net/ppp/ and make the
necessary Kconfig and Makefile changes.
CC: Paul Mackerras <paulus@samba.org >
CC: Frank Cusack <fcusack@fcusack.com >
CC: Michal Ostrowski <mostrows@speakeasy.net >
CC: Michal Ostrowski <mostrows@earthlink.net >
CC: Dmitry Kozlov <xeb@mail.ru >
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com >
2011-08-27 00:58:26 -07:00
