iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net
History
David S. Miller 4dd565134e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 
Conflicts:

	drivers/net/e1000e/ich8lan.c
	drivers/net/e1000e/netdev.c
2008-10-08 14:56:41 -07:00
..
9p
9p: fix put_data error handling
2008-09-24 16:22:22 -05:00
802
list_for_each_rcu must die: networking
2008-07-25 10:53:27 -07:00
8021q
net: Use hton[sl]() instead of __constant_hton[sl]() where applicable
2008-09-20 22:20:49 -07:00
appletalk
net: convert BUG_TRAP to generic WARN_ON
2008-07-25 21:43:18 -07:00
atm
net/atm/lec.c: drop code after return
2008-09-22 19:24:45 -07:00
ax25
ax25: Quick fix for making sure unaccepted sockets get destroyed.
2008-10-06 12:53:50 -07:00
bluetooth
[Bluetooth] Fix regression from using default link policy
2008-09-12 03:11:54 +02:00
bridge
netfilter: xtables: provide invoked family value to extensions
2008-10-08 11:35:20 +02:00
can
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
core
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-10-08 14:56:41 -07:00
dccp
ipv6: added net argument to ICMP6_INC_STATS_BH
2008-10-08 11:14:13 -07:00
decnet
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
econet
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
ethernet
net: Use hton[sl]() instead of __constant_hton[sl]() where applicable
2008-09-20 22:20:49 -07:00
ieee80211
net/ieee80211: adjust error handling
2008-08-22 16:29:49 -04:00
ipv4
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-10-08 14:56:41 -07:00
ipv6
tcpv6: fix option space offsets with md5
2008-10-08 14:36:33 -07:00
ipx
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
irda
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-20 17:43:29 -07:00
iucv
iucv: Fix mismerge again.
2008-09-30 03:03:35 -07:00
key
xfrm: MIGRATE enhancements (draft-ebalard-mext-pfkey-enhanced-migrate)
2008-10-05 13:33:42 -07:00
lapb
[LAPB] net/lapb/lapb_iface.c: use LIST_HEAD instead of LIST_HEAD_INIT
2008-01-28 14:56:52 -08:00
llc
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
mac80211
mac80211: avoid "Wireless Event too big" message for assoc response
2008-10-06 19:37:33 -04:00
netfilter
Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-2.6
2008-10-08 14:26:36 -07:00
netlabel
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
netlink
net: convert BUG_TRAP to generic WARN_ON
2008-07-25 21:43:18 -07:00
netrom
netrom: Fix sock_orphan() use in nr_release
2008-10-06 12:54:57 -07:00
packet
net: convert BUG_TRAP to generic WARN_ON
2008-07-25 21:43:18 -07:00
phonet
Phonet: implement GPRS virtual interface over PEP socket
2008-10-05 11:16:16 -07:00
rfkill
rfkill: update LEDs for all state changes
2008-10-06 18:14:57 -04:00
rose
netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.
2008-07-22 14:16:42 -07:00
rxrpc
net/rxrpc: Use an IS_ERR test rather than a NULL test
2008-08-13 02:40:48 -07:00
sched
pkt_sched: Update qdisc requeue stats in dev_requeue_skb()
2008-10-08 11:36:22 -07:00
sctp
sctp: shrink sctp_tsnmap some more by removing gabs array
2008-10-08 14:19:01 -07:00
sunrpc
net: Use hton[sl]() instead of __constant_hton[sl]() where applicable
2008-09-20 22:20:49 -07:00
tipc
tipc: Don't use structure names which easily globally conflict.
2008-09-02 23:38:32 -07:00
unix
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
2008-07-26 20:23:44 -07:00
wanrouter
wanmain.c doesn't need syncppp.h
2008-07-23 23:00:36 +02:00
wireless
wireless: fix typo in Kconfig.
2008-10-06 18:14:56 -04:00
x25
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
xfrm
xfrm: MIGRATE enhancements (draft-ebalard-mext-pfkey-enhanced-migrate)
2008-10-05 13:33:42 -07:00
compat.c
flag parameters: paccept
2008-07-24 10:47:27 -07:00
Kconfig
Phonet: add CONFIG_PHONET
2008-09-22 20:03:00 -07:00
Makefile
Phonet: add CONFIG_PHONET
2008-09-22 20:03:00 -07:00
nonet.c
…
socket.c
sys_paccept: disable paccept() until API design is resolved
2008-09-23 08:09:14 -07:00
sysctl_net.c
missing bits of net-namespace / sysctl
2008-07-27 09:45:34 -07:00
TUNABLE
…