summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-01-2425-53/+47
|\
| * Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...David S. Miller2011-01-2436-381/+544
| |\
| | * module: fix missing semicolons in MODULE macro usageRusty Russell2011-01-241-1/+1
| | * kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-203-6/+6
| | * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-01-1917-42/+51
| | |\
| * | | net: arp_ioctl() must hold RTNLEric Dumazet2011-01-242-7/+7
| * | | net_sched: accurate bytes/packets stats/ratesEric Dumazet2011-01-2013-30/+24
| | |/ | |/|
| * | sctp: user perfect name for Delayed SACK Timer optionShan Wei2011-01-191-2/+2
| * | net: fix can_checksum_protocol() arguments swapEric Dumazet2011-01-191-1/+1
| * | Revert "netlink: test for all flags of the NLM_F_DUMP composite"David S. Miller2011-01-195-6/+6
* | | net_sched: TCQ_F_CAN_BYPASS generalizationEric Dumazet2011-01-215-6/+20
* | | net: netif_setup_tc() is staticEric Dumazet2011-01-211-1/+1
* | | rtnetlink: fix link attribute validation with IFLA_GROUPPatrick McHardy2011-01-201-5/+8
* | | ipv6: raw: rcu annotationsEric Dumazet2011-01-201-7/+7
* | | neigh: __rcu annotationsEric Dumazet2011-01-201-6/+7
* | | net: ipv6: sit: fix rcu annotationsEric Dumazet2011-01-201-10/+13
* | | net_sched: RCU conversion of stabEric Dumazet2011-01-203-13/+23
* | | net_sched: move TCQ_F_THROTTLED flagEric Dumazet2011-01-206-11/+11
* | | net_sched: sfq: allow divisor to be a parameterEric Dumazet2011-01-201-12/+30
* | | net: dev_close_many() is staticEric Dumazet2011-01-201-1/+1
* | | netfilter: add a missing include in nf_conntrack_reasm.cEric Dumazet2011-01-201-0/+1
* | | netfilter: nf_nat: place conntrack in source hash after SNAT is doneChangli Gao2011-01-201-7/+11
* | | Merge branch 'connlimit' of git://dev.medozas.de/linuxPatrick McHardy2011-01-201-14/+30
|\ \ \
| * | | netfilter: xtables: connlimit revision 1Jan Engelhardt2011-01-191-14/+30
* | | | netfilter: do not omit re-route check on NF_QUEUE verdictFlorian Westphal2011-01-201-1/+1
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-01-2071-1465/+3727
|\ \ \ \
| * \ \ \ Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2011-01-1988-720/+839
| |\ \ \ \
| * | | | | netfilter: nf_conntrack: fix lifetime display for disabled connectionsPatrick McHardy2011-01-191-17/+12
| * | | | | netfilter: nf_conntrack_tstamp: add flow-based timestamp extensionPablo Neira Ayuso2011-01-196-1/+244
| | |/ / / | |/| | |
| * | | | netfilter: nf_conntrack: nf_conntrack snmp helperJiri Olsa2011-01-187-70/+196
| * | | | netfilter: ipt_CLUSTERIP: remove "no conntrack!"Eric Dumazet2011-01-181-6/+1
| * | | | Merge branch 'master' of git://dev.medozas.de/linuxPatrick McHardy2011-01-184-4/+8
| |\ \ \ \
| | * | | | netfilter: xt_connlimit: use hotdrop jump markRichard Weinberger2011-01-181-4/+2
| | * | | | netfilter: xtables: add missing aliases for autoloading via iptablesJan Engelhardt2011-01-183-0/+6
| * | | | | netfilter: allow NFQUEUE bypass if no listener is availableFlorian Westphal2011-01-183-4/+34
| * | | | | netfilter: reduce NF_VERDICT_MASK to 0xffFlorian Westphal2011-01-182-3/+3
| * | | | | netfilter: nfnetlink_queue: do not free skb on errorFlorian Westphal2011-01-182-9/+15
| * | | | | netfilter: nfnetlink_queue: return error number to callerFlorian Westphal2011-01-183-23/+49
| * | | | | netfilter: Kconfig: NFQUEUE is useless without NETFILTER_NETLINK_QUEUEFlorian Westphal2011-01-181-0/+1
| * | | | | netfilter: nf_conntrack: remove an atomic bit operationChangli Gao2011-01-181-1/+1
| * | | | | netfilter: nf_nat: fix conversion to non-atomic bit opsChangli Gao2011-01-181-2/+2
| |/ / / /
| * | | | netfilter: create audit records for x_tables replacesThomas Graf2011-01-161-0/+16
| * | | | netfilter: audit target to record accepted/dropped packetsThomas Graf2011-01-163-0/+215
| * | | | netfilter: nf_conntrack: use is_vmalloc_addr()Patrick McHardy2011-01-144-34/+17
| * | | | Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6Patrick McHardy2011-01-14364-7487/+20913
| |\ \ \ \
| | * | | | netfilter: ebt_ip6: allow matching on ipv6-icmp types/codesFlorian Westphal2011-01-131-12/+34
| | * | | | netfilter: x_table: speedup compat operationsEric Dumazet2011-01-135-34/+55
| | * | | | netfilter: xt_conntrack: support matching on port rangesPatrick McHardy2011-01-131-2/+73
| | * | | | IPVS: netns, final patch enabling network name space.Hans Schillstrom2011-01-137-32/+1
| | * | | | IPVS: netns, misc init_net removal in core.Hans Schillstrom2011-01-132-6/+9
OpenPOWER on IntegriCloud