summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-10-162-1/+10
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2008-10-141-1/+2
| |\
| | * mac80211: fixme for kernel-docRandy Dunlap2008-10-141-1/+2
| * | netfilter: ctnetlink: remove bogus module dependency between ctnetlink and nf...Pablo Neira Ayuso2008-10-141-0/+8
| |/
* | sysctl: simplify ->strategyAlexey Dobriyan2008-10-162-4/+3
* | include: replace __FUNCTION__ with __func__Harvey Harrison2008-10-166-9/+9
* | Merge branch 'next' into for-linusJames Morris2008-10-132-32/+74
|\ \ | |/ |/|
| * netlabel: Add configuration support for local labelingPaul Moore2008-10-101-1/+2
| * cipso: Add support for native local labeling and fixup mapping namesPaul Moore2008-10-101-4/+9
| * netlabel: Changes to the NetLabel security attributes to allow LSMs to pass f...Paul Moore2008-10-101-1/+1
| * selinux: Set socket NetLabel based on connection endpointPaul Moore2008-10-102-0/+18
| * netlabel: Add functionality to set the security attributes of a packetPaul Moore2008-10-102-0/+25
| * netlabel: Add network address selectors to the NetLabel/LSM domain mappingPaul Moore2008-10-101-2/+5
| * netlabel: Replace protocol/NetLabel linking with refrerence countsPaul Moore2008-10-101-10/+11
| * selinux: Fix missing calls to netlbl_skbuff_err()Paul Moore2008-10-101-2/+4
| * netlabel: Remove unneeded in-kernel API functionsPaul Moore2008-10-101-13/+0
* | net: fix dummy 'nf_conntrack_event_cache()'Linus Torvalds2008-10-111-1/+1
* | nf_conntrack_ecache.h: Fix missing bracesGuo-Fu Tseng2008-10-091-0/+1
* | inet: Make tunnel RX/TX byte counters more consistentHerbert Xu2008-10-091-1/+1
* | dsa: add support for Trailer tagging formatLennert Buytenhek2008-10-081-0/+1
* | dsa: add support for original DSA tagging formatLennert Buytenhek2008-10-081-0/+2
* | net: Distributed Switch Architecture protocol supportLennert Buytenhek2008-10-081-0/+34
* | sctp: shrink sctp_tsnmap some more by removing gabs arrayVlad Yasevich2008-10-081-11/+3
* | sctp: Rework the tsn map to use generic bitmap.Vlad Yasevich2008-10-083-32/+12
* | inet: cleanup of local_port_rangeEric Dumazet2008-10-081-0/+4
* | ipv6: making ip and icmp statistics per/namespaceDenis V. Lunev2008-10-082-8/+5
* | ipv6: added net argument to _DEVINC/_DEVADDDenis V. Lunev2008-10-081-19/+21
* | ipv6: added net argument to ICMP6MSGIN_INC_STATS_BHDenis V. Lunev2008-10-081-2/+2
* | ipv6: ICMP6MSGIN_INC_STATS is not usedDenis V. Lunev2008-10-081-2/+0
* | ipv6: added net argument to ICMP6MSGOUT_INC_STATS_BHDenis V. Lunev2008-10-081-2/+2
* | ipv6: added net argument to ICMP6MSGOUT_INC_STATSDenis V. Lunev2008-10-081-2/+2
* | ipv6: added net argument to ICMP6_INC_STATS_BHDenis V. Lunev2008-10-081-1/+2
* | ipv6: added net argument to ICMP6_INC_STATSDenis V. Lunev2008-10-081-1/+2
* | ipv6: added net argument to IP6_ADD_STATS_BHDenis V. Lunev2008-10-081-1/+2
* | ipv6: added net argument to IP6_INC_STATS_BHDenis V. Lunev2008-10-081-1/+2
* | netns: add net parameter to IP6_INC_STATSDenis V. Lunev2008-10-081-1/+2
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2008-10-0813-56/+159
|\ \
| * | netfilter: iptables tproxy coreKOVACS Krisztian2008-10-081-0/+32
| * | netfilter: split netfilter IPv4 defragmentation into a separate moduleKOVACS Krisztian2008-10-081-0/+6
| * | netfilter: netns nat: per-netns bysource hashAlexey Dobriyan2008-10-081-0/+2
| * | netfilter: netns nat: per-netns NAT tableAlexey Dobriyan2008-10-081-0/+1
| * | netfilter: netns nf_conntrack: per-netns conntrack accountingAlexey Dobriyan2008-10-082-5/+7
| * | netfilter: netns nf_conntrack: per-netns net.netfilter.nf_conntrack_log_inval...Alexey Dobriyan2008-10-082-8/+8
| * | netfilter: netns nf_conntrack: per-netns net.netfilter.nf_conntrack_checksum ...Alexey Dobriyan2008-10-082-1/+1
| * | netfilter: netns nf_conntrack: per-netns net.netfilter.nf_conntrack_count sysctlAlexey Dobriyan2008-10-081-0/+4
| * | netfilter: netns nf_conntrack: per-netns statisticsAlexey Dobriyan2008-10-082-4/+5
| * | netfilter: netns nf_conntrack: per-netns event cacheAlexey Dobriyan2008-10-082-6/+21
| * | netfilter: netns nf_conntrack: pass conntrack to nf_conntrack_event_cache() n...Alexey Dobriyan2008-10-081-3/+1
| * | netfilter: netns nf_conntrack: pass netns pointer to L4 protocol's ->error hookAlexey Dobriyan2008-10-081-1/+1
| * | netfilter: netns nf_conntrack: pass netns pointer to nf_conntrack_in()Alexey Dobriyan2008-10-081-1/+2