黄涛 84aa38e58d Merge remote branch 'linux-2.6.32.y/master' into develop ...

Conflicts:
	drivers/net/wireless/orinoco/main.c
	drivers/net/wireless/orinoco/wext.c
	drivers/net/wireless/p54/p54usb.c

2011-02-13 10:25:30 +08:00

..

9p

9p: strlen() doesn't count the terminator

2010-08-10 10:20:39 -07:00

802

…

8021q

vlan: Fix register_vlan_dev() error path

2009-11-17 06:45:04 -08: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: netrom: rose: Fix timer oopses

2010-02-09 04:50:56 -08:00

bluetooth

BT: add bluetooth bcm4329 driver

2010-12-20 21:45:12 +08:00

bridge

bridge: Clear INET control block of SKBs passed into ip_fragment().

2010-09-26 17:21:19 -07:00

can

can-bcm: fix minor heap overflow

2010-12-09 13:27:10 -08:00

core

net: release dst entry while cache-hot for GSO case too

2011-01-07 14:43:14 -08:00

dcb

net: fix double skb free in dcbnl

2009-09-26 20:16:15 -07:00

dccp

dccp_probe: Fix module load dependencies between dccp and dccp_probe

2010-05-12 14:57:11 -07:00

decnet

DECnet: don't leak uninitialized stack byte

2010-12-09 13:27:03 -08:00

dsa

netdev: convert pseudo-devices to netdev_tx_t

2009-09-01 01:13:07 -07:00

econet

econet: fix CVE-2010-3850

2010-12-09 13:27:12 -08:00

ethernet

…

ieee802154

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

ipv4

Merge remote branch 'linux-2.6.32.y/master' into develop

2010-12-16 20:54:24 +08:00

ipv6

Merge remote branch 'linux-2.6.32.y/master' into develop

2010-12-16 20:54:24 +08:00

ipx

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

irda

irda: Fix heap memory corruption in iriap.c

2010-12-09 13:26:32 -08: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

net: remove NET_RX_BAD and NET_RX_CN* defines

2009-07-05 19:15:35 -07:00

llc

net/llc: make opt unsigned in llc_ui_setsockopt()

2010-09-26 17:21:24 -07:00

mac80211

mac80211: fix supported rates IE if AP doesn't give us it's rates

2010-08-02 10:21:27 -07:00

netfilter

netfilter: nf_conntrack: allow nf_ct_alloc_hashtable() to get highmem pages

2010-12-09 13:26:51 -08: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

netlink: fix compat recvmsg

2010-08-26 16:41:55 -07:00

netrom

ax25: netrom: rose: Fix timer oopses

2010-02-09 04:50:56 -08:00

packet

af_packet: Don't use skb after dev_queue_xmit()

2010-02-09 04:50:56 -08:00

phonet

Phonet: disable network namespace support

2010-10-28 21:44:17 -07:00

rds

rds: Integer overflow in RDS cmsg handling

2010-12-09 13:27:12 -08:00

rfkill

rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down

2010-02-08 15:35:55 -08:00

rose

rose: Fix signedness issues wrt. digi count.

2010-10-28 21:44:10 -07:00

rxrpc

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

sched

net sched: fix some kernel memory leaks

2010-12-09 13:27:14 -08:00

sctp

sctp: Fix a race between ICMP protocol unreachable and connect()

2011-01-07 14:43:18 -08:00

sunrpc

sunrpc: prevent use-after-free on clearing XPT_BUSY

2011-01-07 14:43:05 -08:00

tipc

tipc: Fix oops on send prior to entering networked mode (v3)

2010-07-05 11:11:16 -07:00

unix

UNIX: Do not loop forever at unix_autobind().

2010-09-26 17:21:21 -07:00

wanrouter

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

wimax

wimax: fix warning caused by not checking retval of rfkill_set_hw_state()

2009-06-11 11:12:48 -07:00

wireless

wext: fix potential private ioctl memory content leak

2010-10-28 21:44:02 -07:00

x25

x25: Prevent crashing when parsing bad X.25 facilities

2010-12-09 13:27:10 -08:00

xfrm

net: file_operations should be const

2009-09-02 01:03:53 -07:00

compat.c

net: Limit socket I/O iovec total length to INT_MAX.

2010-12-09 13:27:13 -08:00

Kconfig

Paranoid network.

2010-02-08 15:07:32 -08:00

Makefile

net: remove redundant sched/ in net/Makefile

2009-07-12 20:11:14 -07:00

nonet.c

…

socket.c

Merge remote branch 'linux-2.6.32.y/master' into develop

2010-12-16 20:54:24 +08:00

sysctl_net.c

…

TUNABLE

…