summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'v2.6.36-rc7' into perf/coreIngo Molnar2010-10-0837-152/+221
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-10-045-19/+27
| |\
| | * vlan: dont drop packets from unknown vlans in promiscuous modeEric Dumazet2010-09-301-4/+10
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-09-301-4/+0
| | |\
| | | * mac80211: fix use-after-freeJohannes Berg2010-09-241-4/+0
| | * | Phonet: Correct header retrieval after pskb_may_pullKumar Sanghvi2010-09-291-1/+2
| | * | ip_gre: Fix dependencies wrt. ipv6.David S. Miller2010-09-281-0/+1
| | * | net-2.6: SYN retransmits: Add new parameter to retransmits_timed_out()Damian Lukowski2010-09-281-10/+14
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-09-2831-122/+176
| |\| |
| | * | tcp: Fix >4GB writes on 64-bit.David S. Miller2010-09-272-3/+4
| | * | net/9p: Mount only matching virtio channelsSven Eckelmann2010-09-271-1/+2
| | * | ipv6: add IPv6 to neighbour table overflow warningUlrich Weber2010-09-272-2/+2
| | * | tcp: fix TSO FACK loss marking in tcp_mark_head_lostYuchung Cheng2010-09-271-1/+2
| | * | ipv6: add a missing unregister_pernet_subsys callNeil Horman2010-09-262-3/+13
| | * | br2684: fix scheduling while atomicKarl Hiramoto2010-09-261-10/+2
| | * | net: fix a lockdep splatEric Dumazet2010-09-246-26/+26
| | * | xfrm4: strip ECN bits from tos fieldUlrich Weber2010-09-221-1/+1
| | * | netfilter: nf_conntrack_defrag: check socket type before touching nodefrag flagJiri Olsa2010-09-221-1/+3
| | * | netfilter: nf_nat_snmp: fix checksum calculation (v4)Patrick McHardy2010-09-221-2/+4
| | * | netfilter: fix a race in nf_ct_ext_create()Eric Dumazet2010-09-221-1/+3
| | * | netfilter: fix ipt_REJECT TCP RST routing for indev == outdevChangli Gao2010-09-221-0/+1
| | * | netfilter: nf_ct_sip: default to NF_ACCEPT in sip_help_tcp()Simon Horman2010-09-221-1/+1
| | * | netfilter: tproxy: nf_tproxy_assign_sock() can handle tw socketsEric Dumazet2010-09-221-1/+5
| | * | ip: fix truesize mismatch in ip fragmentationEric Dumazet2010-09-212-11/+26
| | * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-09-211-1/+1
| | |\|
| | | * wext: fix potential private ioctl memory content leakJohannes Berg2010-09-201-1/+1
| | * | tcp: Fix race in tcp_pollTom Marshall2010-09-202-2/+7
| | * | rose: Fix signedness issues wrt. digi count.David S. Miller2010-09-201-2/+2
| | * | xfrm: Allow different selector family in temporary stateThomas Egerer2010-09-204-49/+67
| | * | ip_gre: CONFIG_IPV6_MODULE supportEric Dumazet2010-09-201-4/+4
| * | | net/9p: fix memory handling/allocation in rdma_request()Davidlohr Bueso2010-09-271-11/+18
* | | | Merge commit 'v2.6.36-rc5' into perf/coreIngo Molnar2010-09-2115-87/+96
|\| | |
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-09-199-11/+10
| |\| |
| | * | sctp: Do not reset the packet during sctp_packet_config().Vlad Yasevich2010-09-171-1/+0
| | * | net/llc: storing negative error codes in unsigned shortDan Carpenter2010-09-161-1/+1
| | * | xfrm: dont assume rcu_read_lock in xfrm_output_one()Eric Dumazet2010-09-161-1/+1
| | * | net: RPS needs to depend upon USE_GENERIC_SMP_HELPERSDavid S. Miller2010-09-141-1/+1
| | * | net: use rcu_barrier() in rollback_registered_manyEric Dumazet2010-09-141-1/+1
| | * | ipv4: enable getsockopt() for IP_NODEFRAGMichael Kerrisk2010-09-131-0/+3
| | * | ipv4: force_igmp_version ignored when a IGMPv3 query receivedBob Arendt2010-09-131-1/+1
| | * | net/llc: make opt unsigned in llc_ui_setsockopt()Dan Carpenter2010-09-131-1/+2
| | * | sch_atm: Fix potential NULL deref.David S. Miller2010-09-121-4/+0
| * | | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2010-09-146-76/+86
| |\ \ \
| | * | | sunrpc: increase MAX_HASHTABLE_BITS to 14Miquel van Smoorenburg2010-09-121-1/+1
| | * | | gss:spkm3 miss returning error to caller when import security contextBian Naimeng2010-09-121-1/+4
| | * | | gss:krb5 miss returning error to caller when import security contextBian Naimeng2010-09-121-2/+8
| | * | | SUNRPC: cleanup state-machine orderingJ. Bruce Fields2010-09-121-42/+42
| | * | | SUNRPC: Fix a race in rpc_info_openTrond Myklebust2010-09-122-20/+20
| | * | | SUNRPC: Fix race corrupting rpc upcallTrond Myklebust2010-09-122-7/+8
| | * | | Fix null dereference in call_allocateJ. Bruce Fields2010-09-121-4/+4
| | |/ /