summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-08-045-5/+5
|\
| * Merge branch 'master' into for-nextJiri Kosina2010-08-0437-123/+695
| |\
| * | fix comment/printk typos concerning "already"Uwe Kleine-König2010-07-111-1/+1
| * | Merge branch 'master' into for-nextJiri Kosina2010-06-1674-398/+731
| |\ \
| * | | fix typos concerning "initiali[zs]e"Uwe Kleine-König2010-06-164-4/+4
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-08-04301-5986/+9345
|\ \ \ \ | |_|_|/ |/| | |
| * | | can-raw: Fix skb_orphan_try handlingOliver Hartkopp2010-08-031-0/+4
| * | | Revert "net: remove zap_completion_queue"David S. Miller2010-08-032-3/+32
| * | | net: cleanup inclusionChangli Gao2010-08-021-2/+0
| * | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-08-026-11/+18
| |\ \ \
| | * | | act_nat: the checksum of ICMP doesn't have pseudo headerChangli Gao2010-07-311-1/+1
| | * | | act_nat: fix wild pointerChangli Gao2010-07-311-0/+1
| | * | | bridge: Fix skb leak when multicast parsing fails on TXHerbert Xu2010-07-301-1/+3
| | * | | tcp: cookie transactions setsockopt memory leakDmitry Popov2010-07-301-2/+5
| | * | | bridge: add rcu_read_lock on transmitstephen hemminger2010-07-284-6/+8
| * | | | u32: negative offset fixstephen hemminger2010-08-021-2/+4
| * | | | ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twiceChangli Gao2010-08-021-4/+2
| * | | | net: Add getsockopt support for TCP thin-streamsJosh Hunt2010-08-021-0/+6
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-08-0235-352/+717
| |\ \ \ \
| | * | | | netfilter: nf_conntrack_acct: use skb->len for accountingChangli Gao2010-08-021-2/+1
| | * | | | netfilter: nf_nat: don't check if the tuple is unique when there isn't any ot...Changli Gao2010-08-023-6/+6
| | * | | | netfilter: nf_nat: make unique_tuple return voidChangli Gao2010-08-029-28/+26
| | * | | | netfilter: nf_nat: use local variable hdrlenChangli Gao2010-08-021-11/+7
| | * | | | ipvs: provide default ip_vs_conn_{in,out}_get_protoSimon Horman2010-08-024-153/+51
| | * | | | ipvs: remove EXPERIMENTAL tagSimon Horman2010-08-021-1/+1
| | * | | | netfilter: nf_conntrack_extend: introduce __nf_ct_ext_exist()Changli Gao2010-08-021-10/+12
| | * | | | netfilter: {ip,ip6,arp}_tables: dont block bottom half more than necessaryEric Dumazet2010-08-023-12/+18
| | * | | | netfilter: iptables: use skb->len for accountingChangli Gao2010-07-231-1/+1
| | * | | | netfilter: ip6tables: use skb->len for accountingChangli Gao2010-07-231-3/+1
| | * | | | xt_quota: report initial quota value instead of current value to userspaceChangli Gao2010-07-231-2/+0
| | * | | | netfilter: xt_quota: use per-rule spin lockChangli Gao2010-07-231-5/+5
| | * | | | netfilter: arptables: use arp_hdr_len()Changli Gao2010-07-231-4/+1
| | * | | | netfilter: nf_nat_core: merge the same linesChangli Gao2010-07-231-7/+2
| | * | | | netfilter: add xt_cpu matchEric Dumazet2010-07-233-0/+73
| | * | | | IPVS: make FTP work with full NAT supportHannes Eder2010-07-234-57/+165
| | * | | | IPVS: make friends with nf_conntrackHannes Eder2010-07-233-37/+30
| | * | | | netfilter: xt_ipvs (netfilter matcher for IPVS)Hannes Eder2010-07-234-0/+201
| | * | | | netfilter: add CHECKSUM targetMichael S. Tsirkin2010-07-153-0/+87
| | * | | | netfilter: nf_ct_tcp: fix flow recovery with TCP window tracking enabledPablo Neira Ayuso2010-07-151-1/+9
| | * | | | netfilter: xt_TPROXY: the length of lines should be within 80Changli Gao2010-07-091-2/+4
| | * | | | ipvs: lvs sctp protocol handler is incorrectly invoked ip_vs_app_pkt_outXiaoyu Du2010-07-091-1/+1
| | * | | | ipvs: Kconfig cleanupMichal Marek2010-07-051-4/+1
| | * | | | netfilter: ipt_REJECT: avoid touching dst refEric Dumazet2010-07-051-1/+1
| | * | | | netfilter: ipt_REJECT: postpone the checksum calculation.Changli Gao2010-07-051-5/+5
| | * | | | netfilter: nf_conntrack_reasm: add fast path for in-order fragmentsChangli Gao2010-07-051-0/+9
| * | | | | net: ingress filter message limitStephen Hemminger2010-08-011-4/+4
| * | | | | net/rose: Use GFP_ATOMICJulia Lawall2010-08-011-1/+3
| * | | | | bridge: Allow multicast snooping to be disabled before ifupHerbert Xu2010-07-301-5/+4
| * | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-07-2929-402/+907
| |\ \ \ \ \
| | * | | | | mac80211: allow drivers to request DTIM periodJohannes Berg2010-07-294-3/+77
OpenPOWER on IntegriCloud