summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* pkt_sched: fix sparse warningHannes Eder2008-11-281-1/+1
* netlink: allow empty nested attributesPatrick McHardy2008-11-281-0/+6
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2008-11-2830-211/+427
|\
| * netfilter: fix warning in net/netfilter/nf_conntrack_ftp.cIngo Molnar2008-11-251-1/+1
| * netfilter: nfmark IPV6 routing in OUTPUT, mangle, NFQUEUEEric Leblond2008-11-251-1/+4
| * netfilter: nfmark routing in OUTPUT, mangle, NFQUEUEEric Leblond2008-11-251-0/+3
| * netfilter: nf_conntrack_ftp: change "partial ..." message to pr_debug()Patrick McHardy2008-11-241-4/+2Star
| * netfilter: nf_conntrack_proto_sctp: avoid bogus warningPatrick McHardy2008-11-241-1/+1
| * netfilter: nf_conntrack_proto_gre: spread __exitAlexey Dobriyan2008-11-201-1/+1
| * netfilter: ip6table_filter: merge LOCAL_IN and FORWARD hooksAlexey Dobriyan2008-11-201-14/+3Star
| * netfilter: xt_recent: don't save proc dirsAlexey Dobriyan2008-11-201-11/+11
| * netfilter: nf_conntrack: fix warning and prototype mismatchPatrick McHardy2008-11-181-4/+4
| * netfilter: nfnetlink_log: fix warning and prototype mismatchPatrick McHardy2008-11-181-0/+1
| * netfilter: ctnetlink: deliver events for conntracks changed from userspacePablo Neira Ayuso2008-11-184-29/+141
| * netfilter: ctnetlink: helper modules load-on-demand supportPablo Neira Ayuso2008-11-183-37/+93
| * netfilter: nf_conntrack: connection tracking helper name persistent aliasesPablo Neira Ayuso2008-11-179-0/+9
| * netfilter: ctnetlink: get rid of module refcounting in ctnetlinkPablo Neira Ayuso2008-11-171-20/+18Star
| * netfilter: ctnetlink: use EOPNOTSUPP instead of EINVAL if the conntrack has n...Pablo Neira Ayuso2008-11-171-1/+1
| * netfilter: ctnetlink: use nf_conntrack_get instead of atomic_incPablo Neira Ayuso2008-11-171-1/+1
| * netfilter: nf_nat: remove warn_if_extra_mangleSimon Arlott2008-11-041-23/+0Star
| * netfilter: netns ebtables: br_nf_pre_routing_finish() fixupAlexey Dobriyan2008-11-041-1/+1
| * netfilter: netns ebtables: ebtable_nat in netnsAlexey Dobriyan2008-11-041-15/+32
| * netfilter: netns ebtables: ebtable_filter in netnsAlexey Dobriyan2008-11-041-13/+37
| * netfilter: netns ebtables: ebtable_broute in netnsAlexey Dobriyan2008-11-041-8/+27
| * netfilter: netns ebtables: more cleanup during ebt_unregister_table()Alexey Dobriyan2008-11-041-0/+4
| * netfilter: netns ebtables: part 2Alexey Dobriyan2008-11-044-33/+45
| * netfilter: netns ebtables: part 1Alexey Dobriyan2008-11-044-16/+17
| * netfilter: arptable_filter: merge forward hookAlexey Dobriyan2008-11-041-11/+1Star
| * netfilter: netns-aware ipt_addrtypeAlexey Dobriyan2008-11-041-7/+9
| * netfilter: xt_NFLOG: don't call nf_log_packet in NFLOG module.Eric Leblond2008-11-042-3/+5
* | sctp: fix missing label when PROC_FS=nRandy Dunlap2008-11-281-2/+3
* | decnet: remove private wrappers of endian helpersHarvey Harrison2008-11-278-86/+88
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2008-11-278-27/+52
|\ \
| * | netfilter: ctnetlink: fix GFP_KERNEL allocation under spinlockPatrick McHardy2008-11-261-1/+1
| * | net: make skb_truesize_bug() call WARN()Arjan van de Ven2008-11-261-1/+1
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2008-11-252-2/+10
| |\ \
| | * | net/wireless/reg.c: fix bad WARN_ON in if statementIngo Molnar2008-11-251-2/+2
| | * | mac80211 : Fix setting ad-hoc mode and non-ibss channelAbhijeet Kolekar2008-11-251-0/+8
| * | | rose: zero length frame filtering in af_rose.cBernard Pidoux2008-11-251-0/+10
| * | | bridge: netfilter: fix update_pmtu crash with GREHerbert Xu2008-11-251-0/+13
| * | | netfilter: ctnetlink: fix conntrack creation racePatrick McHardy2008-11-252-4/+3Star
| |/ /
| * | net: Fix memory leak in the proto_register functionCatalin Marinas2008-11-221-19/+12Star
| * | tcp: Do not use TSO/GSO when there is urgent dataPetr Tesarik2008-11-221-2/+5
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2008-11-2713-91/+606
|\ \ \
| * | | mac80211: fix unaligned access in ieee80211_wep_encrypt_dataIvan Kuten2008-11-261-3/+4
| * | | nl80211: Change max TX power to be in mBm instead of dBmJouni Malinen2008-11-261-2/+2
| * | | rfkill: always call get_state() hook on resumeHenrique de Moraes Holschuh2008-11-261-0/+10
| * | | rfkill: preserve state across suspendHenrique de Moraes Holschuh2008-11-261-1/+6
| * | | mac80211: Look out for some other AP when disassoc is received.Vivek Natarajan2008-11-261-2/+6
| * | | nl80211: Report max TX power in NL80211_BAND_ATTR_FREQSJouni Malinen2008-11-261-0/+3