summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security' of git://git.kernel.org/pub/scm/linux/kernel/git/linv...Linus Torvalds2009-11-304-18/+13
|\
| * mac80211: fix spurious delBA handlingJohannes Berg2009-11-303-13/+12
| * mac80211: fix two remote exploitsJohannes Berg2009-11-302-5/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-11-3012-62/+56
|\ \
| * | ipv4: additional update of dev_net(dev) to struct *net in ip_fragment.c, NULL...David Ford2009-11-291-1/+1
| * | sctp: on T3_RTX retransmit all the in-flight chunksAndrei Pelinescu-Onciul2009-11-293-14/+2
| |/
| * pktgen: Fix netdevice unregisterEric Dumazet2009-11-241-5/+11
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2009-11-234-20/+26
| |\
| | * rfkill: fix miscdev opsJohannes Berg2009-11-231-0/+1
| | * mac80211: fix resumeJohannes Berg2009-11-192-10/+17
| | * mac80211: fix addba timer (again...)Johannes Berg2009-11-181-10/+8
| * | pktgen: Fix device name comparesEric Dumazet2009-11-231-8/+10
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2009-11-231-1/+1
| |\ \
| | * | netfilter: xt_limit: fix invalid return code in limit_mt_check()Patrick McHardy2009-11-231-1/+1
| | * | netfilter: nf_log: fix sleeping function called from invalid context in seq_s...Wu Fengguang2009-11-131-13/+5
| | * | netfilter: xt_osf: fix xt_osf_remove_callback() return valueRoel Kluin2009-11-131-1/+1
| * | | netfilter: nf_log: fix sleeping function called from invalid context in seq_s...Patrick McHardy2009-11-191-13/+5
| * | | netfilter: xt_osf: fix xt_osf_remove_callback() return valuePatrick McHardy2009-11-191-1/+1
* | | | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2009-11-191-10/+8
|\ \ \ \ | |/ / / |/| | |
| * | | SUNRPC: Address buffer overrun in rpc_uaddr2sockaddr()Chuck Lever2009-11-141-10/+8
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-11-1811-45/+75
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | vlan: Fix register_vlan_dev() error pathEric Dumazet2009-11-171-2/+5
| * | gro: Fix illegal merging of trailer trashHerbert Xu2009-11-171-1/+2
| * | net: Fix the rollback test in dev_change_name()Eric Dumazet2009-11-161-5/+6
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtma...David S. Miller2009-11-152-4/+10
| |\ \
| | * | Bluetooth: Fix regression with L2CAP configuration in Basic ModeGustavo F. Padovan2009-11-161-3/+8
| | * | Bluetooth: Select Basic Mode as default for SOCK_SEQPACKETGustavo F. Padovan2009-11-161-1/+1
| | * | Bluetooth: Set general bonding security for ACL by defaultAndrei Emeltchenko2009-11-161-0/+1
| | |/
| * | ipmr: missing dev_put() on error path in vif_add()Dan Carpenter2009-11-131-1/+3
| * | sctp: Set socket source address when additing first transportVlad Yasevich2009-11-131-1/+2
| * | sctp: Fix regression introduced by new sctp_connectx apiVlad Yasevich2009-11-131-5/+13
| * | sctp: Set source addresses on the association before adding transportsVlad Yasevich2009-11-133-19/+22
| * | tcp: provide more information on the tcp receive_queue bugsIlpo Järvinen2009-11-131-7/+12
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-11-0910-92/+107
|\|
| * can: should not use __dev_get_by_index() without locksEric Dumazet2009-11-081-7/+12
| * ipip: Fix handling of DF packets when pmtudisc is OFFHerbert Xu2009-11-061-15/+17
| * netfilter: xt_connlimit: fix regression caused by zero family valueJan Engelhardt2009-11-061-6/+4
| * decnet: netdevice refcount leakEric Dumazet2009-11-061-4/+3
| * netfilter: nf_nat: fix NAT issue in 2.6.30.4+Jozsef Kadlecsik2009-11-064-49/+60
| * rose: device refcount leakEric Dumazet2009-11-051-10/+6
| * bridge: prevent bridging wrong deviceStephen Hemminger2009-11-051-1/+5
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-11-0312-44/+65
|\|
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2009-11-025-15/+25
| |\
| | * mac80211: check interface is down before type changeJohannes Berg2009-11-021-3/+3
| | * cfg80211: fix NULL ptr derefJohannes Berg2009-11-021-2/+5
| | * mac80211: fix reason code output endiannessJohannes Berg2009-10-301-1/+1
| | * mac80211: fix addba timerJohannes Berg2009-10-301-7/+12
| | * mac80211: fix BSS leakJohannes Berg2009-10-301-2/+4
| * | gre: Fix dev_addr clobbering for gretapHerbert Xu2009-10-301-12/+16
| * | net: fix sk_forward_alloc corruptionEric Dumazet2009-10-304-12/+16
| |/