Linus Torvalds
4848490c50
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: (21 commits)
niu: VLAN_ETH_HLEN should be used to make sure that the whole MAC header was copied to the head buffer in the Vlan packets case
KS8851: Fix ks8851_set_rx_mode() for IFF_MULTICAST
KS8851: Fix MAC address write order
KS8851: Add soft reset at probe time
net: fix section mismatch in fec.c
net: Fix struct inet_timewait_sock bitfield annotation
tcp: Try to catch MSG_PEEK bug
net: Fix IP_MULTICAST_IF
bluetooth: static lock key fix
bluetooth: scheduling while atomic bug fix
tcp: fix TCP_DEFER_ACCEPT retrans calculation
tcp: reduce SYN-ACK retrans for TCP_DEFER_ACCEPT
tcp: accept socket after TCP_DEFER_ACCEPT period
Revert "tcp: fix tcp_defer_accept to consider the timeout"
AF_UNIX: Fix deadlock on connecting to shutdown socket
ethoc: clear only pending irqs
ethoc: inline regs access
vmxnet3: use dev_dbg, fix build for CONFIG_BLOCK=n
virtio_net: use dev_kfree_skb_any() in free_old_xmit_skbs()
be2net: fix support for PCI hot plug
...
2009-10-23 07:34:23 +09:00
..
9p
virtio: add virtio IDs file
2009-09-23 22:26:32 +09:30
802
8021q
net: fix vlan_get_size to include vlan_flags size
2009-09-26 20:16:07 -07:00
appletalk
Have atalk_route_packet() return NET_RX_SUCCESS not NET_XMIT_SUCCESS
2009-09-14 17:02:47 -07:00
atm
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
ax25
ax25: Fix possible oops in ax25_make_new
2009-09-30 16:44:12 -07:00
bluetooth
bluetooth: static lock key fix
2009-10-19 19:36:49 -07:00
bridge
bridge: Fix double-free in br_add_if.
2009-09-28 12:54:25 -07:00
can
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
core
wext: let get_wireless_stats() sleep
2009-10-05 02:22:23 -07:00
dcb
net: fix double skb free in dcbnl
2009-09-26 20:16:15 -07:00
dccp
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
decnet
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
dsa
netdev: convert pseudo-devices to netdev_tx_t
2009-09-01 01:13:07 -07:00
econet
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-08-12 17:44:53 -07:00
ethernet
ieee802154
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
ipv4
tcp: Try to catch MSG_PEEK bug
2009-10-20 00:51:57 -07:00
ipv6
net: Fix IP_MULTICAST_IF
2009-10-19 21:34:20 -07:00
ipx
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
irda
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
iucv
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
key
net: file_operations should be const
2009-09-02 01:03:53 -07:00
lapb
llc
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2009-10-15 15:03:17 -07:00
netfilter
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
netlabel
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-07-30 19:22:43 -07:00
netlink
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
netrom
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
packet
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2009-09-30 17:36:45 -07:00
phonet
Phonet: fix mutex imbalance
2009-09-30 16:41:34 -07:00
rds
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
rfkill
headers: remove sched.h from poll.h
2009-10-04 15:05:10 -07:00
rose
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
rxrpc
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
sched
pkt_sched: pedit use proper struct
2009-10-11 23:03:47 -07:00
sctp
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
sunrpc
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
tipc
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
unix
AF_UNIX: Fix deadlock on connecting to shutdown socket
2009-10-18 23:17:37 -07:00
wanrouter
headers: smp_lock.h redux
2009-07-12 12:22:34 -07:00
wimax
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2009-10-15 15:03:17 -07:00
x25
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
xfrm
net: file_operations should be const
2009-09-02 01:03:53 -07:00
compat.c
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
Kconfig
net/compat/wext: send different messages to compat tasks
2009-07-15 08:53:39 -07:00
Makefile
net: remove redundant sched/ in net/Makefile
2009-07-12 20:11:14 -07:00
nonet.c
socket.c
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
sysctl_net.c
TUNABLE