summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* netfilter: nf_conntrack: fix linker error with NF_CONNTRACK_TIMESTAMP=nPatrick McHardy2011-01-201-0/+12
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-01-2015-85/+484
|\
| * Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2011-01-199-12/+40
| |\
| * | netfilter: nf_conntrack_tstamp: add flow-based timestamp extensionPablo Neira Ayuso2011-01-193-0/+59
| * | netfilter: nf_conntrack: nf_conntrack snmp helperJiri Olsa2011-01-181-0/+6
| * | netfilter: nf_nat: fix conversion to non-atomic bit opsChangli Gao2011-01-181-2/+2
| * | netfilter: nf_conntrack: use is_vmalloc_addr()Patrick McHardy2011-01-143-5/+2
| * | Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6Patrick McHardy2011-01-1455-939/+1161
| |\ \
| | * | IPVS: netns, svc counters moved in ip_vs_ctl,cHans Schillstrom2011-01-131-0/+3
| | * | IPVS: netns, trash handlingHans Schillstrom2011-01-132-2/+5
| | * | IPVS: netns, defense work timer.Hans Schillstrom2011-01-132-1/+4
| | * | IPVS: netns, ip_vs_ctl local vars moved to ipvs struct.Hans Schillstrom2011-01-132-18/+46
| | * | IPVS: netns, connection hash got net as param.Hans Schillstrom2011-01-132-11/+44
| | * | IPVS: netns, ip_vs_stats and its procfsHans Schillstrom2011-01-132-3/+52
| | * | IPVS: netns awareness to ip_vs_syncHans Schillstrom2011-01-132-9/+21
| | * | IPVS: netns awareness to ip_vs_estHans Schillstrom2011-01-132-2/+6
| | * | IPVS: netns awareness to ip_vs_appHans Schillstrom2011-01-132-6/+11
| | * | IPVS: netns, common protocol changes and use of appcnt.Hans Schillstrom2011-01-131-2/+0
| | * | IPVS: netns, use ip_vs_proto_data as param.Hans Schillstrom2011-01-131-12/+6
| | * | IPVS: netns preparation for proto_sctpHans Schillstrom2011-01-131-0/+9
| | * | IPVS: netns preparation for proto_udpHans Schillstrom2011-01-131-0/+8
| | * | IPVS: netns preparation for proto_tcpHans Schillstrom2011-01-132-1/+9
| | * | IPVS: netns, prepare protocolHans Schillstrom2011-01-132-1/+22
| | * | IPVS: netns awarness to lblc shedulerHans Schillstrom2011-01-131-0/+4
| | * | IPVS: netns awarness to lblcr shedulerHans Schillstrom2011-01-131-0/+5
| | * | IPVS: netns to services part 1Hans Schillstrom2011-01-132-5/+67
| | * | IPVS: netns, add basic init per netns.Hans Schillstrom2011-01-133-0/+38
| | * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...Simon Horman2011-01-1352-871/+806
| | |\ \
| * | | | netfilter: fix Kconfig dependenciesPatrick McHardy2011-01-142-4/+4
| |/ / /
| * | | netfilter: fix compilation when conntrack is disabled but tproxy is enabledKOVACS Krisztian2010-12-152-10/+10
| * | | IPVS: Backup, adding version 0 sending capabilitiesHans Schillstrom2010-11-251-0/+2
| * | | IPVS: Backup, Change sending to Version 1 formatHans Schillstrom2010-11-251-1/+1
| * | | IPVS: Backup, Adding Version 1 receive capabilityHans Schillstrom2010-11-251-0/+1
| * | | IPVS: Backup, Prepare for transferring firewall marks (fwmark) to the backup ...Hans Schillstrom2010-11-251-2/+4
| * | | IPVS: Make the cp argument to ip_vs_sync_conn() staticSimon Horman2010-11-161-1/+1
| * | | IPVS: Add persistence engine to connection entrySimon Horman2010-11-161-2/+14
| * | | netfilter: add __rcu annotationsEric Dumazet2010-11-152-3/+3
| * | | netfilter: nf_nat: define nat_pptp_info as neededChangli Gao2010-11-151-0/+2
| * | | netfilter: ct_extend: define NF_CT_EXT_* as neededChangli Gao2010-11-153-0/+18
| * | | netfilter: nf_nat: don't use atomic bit operationChangli Gao2010-11-151-2/+2
| * | | netfilter: nf_conntrack: define ct_*_info as neededChangli Gao2010-11-151-0/+13
| * | | netfilter: nf_conntrack: don't always initialize ct->protoChangli Gao2010-11-121-3/+3
* | | | net: filter: dont block softirqs in sk_run_filter()Eric Dumazet2011-01-181-1/+1
| |_|/ |/| |
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-01-146-12/+27
|\ \ \
| * | | ipsec: update MAX_AH_AUTH_LEN to support sha512Nicolas Dichtel2011-01-131-1/+1
| * | | sched: remove unused backlog in RED statsstephen hemminger2011-01-121-1/+0
| * | | Merge branch 'master' of git://1984.lsi.us.es/net-2.6David S. Miller2011-01-122-10/+10
| |\ \ \
| | * | | netfilter: fix compilation when conntrack is disabled but tproxy is enabledKOVACS Krisztian2011-01-122-10/+10
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-01-122-0/+16
| |\ \ \ \
| | * | | | cfg80211: add mesh join/leave callback docsJohannes Berg2011-01-101-0/+2