summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* net: Make "networking" one-click deselectable.Robert P. J. Day2008-07-301-6/+1
* ipv6: Fix useless proc net sockstat6 removalDaniel Lezcano2008-07-301-1/+0
* tcp: MD5: Use MIB counter instead of warning for MD5 mismatch.David S. Miller2008-07-303-27/+12
* pkt_sched: Fix OOPS on ingress qdisc add.David S. Miller2008-07-303-46/+23
* IPv6: datagram_send_ctl() should exit immediately when an error occuredMiao Xie2008-07-291-1/+1
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2008-07-299-207/+319
|\
| * mac80211: fix mesh beaconingLuis Carlos Cobo2008-07-291-0/+1
| * mac80211: fix cfg80211 hooks for master interfaceJohannes Berg2008-07-291-15/+88
| * nl80211: fix dump callbacksJohannes Berg2008-07-291-122/+153
| * mac80211: partially fix skb->cb useJohannes Berg2008-07-295-39/+30
| * mac80211: append CONFIG_ to MAC80211_VERBOSE_PS_DEBUG in net/mac80211/tx.c.Rami Rosen2008-07-291-3/+3
| * mac80211: return correct error return from ieee80211_wep_initJeremy Fitzhardinge2008-07-292-4/+4
| * mac80211: tx, use dev_kfree_skb_any for beacon_getJiri Slaby2008-07-291-1/+1
| * rfkill: yet more minor kernel-doc fixesHenrique de Moraes Holschuh2008-07-291-10/+10
| * rfkill: mutex fixesHenrique de Moraes Holschuh2008-07-291-10/+19
| * rfkill: fix led-trigger unregister order in error unwindHenrique de Moraes Holschuh2008-07-291-2/+4
| * rfkill: document rfkill_force_state as required (v2)Henrique de Moraes Holschuh2008-07-291-1/+6
* | Merge branch 'linus' into cpus4096Ingo Molnar2008-07-287-50/+58
|\|
| * Merge branch 'master' of git://eden-feed.erg.abdn.ac.uk/net-2.6David S. Miller2008-07-275-44/+56
| |\
| | * dccp: Add check for truncated ICMPv6 DCCP error packetsWei Yongjun2008-07-261-0/+6
| | * dccp: Fix incorrect length check for ICMPv4 packetsWei Yongjun2008-07-261-3/+4
| | * dccp: Add check for sequence number in ICMPv6 messageWei Yongjun2008-07-261-1/+9
| | * dccp: Fix sequence number check for ICMPv4 packetsWei Yongjun2008-07-261-1/+1
| | * dccp: Bug-Fix - AWL was never updatedGerrit Renker2008-07-261-18/+15
| | * dccp: Allow to distinguish original and retransmitted packetsGerrit Renker2008-07-263-21/+21
| * | net: missing bits of net-namespace / sysctlAl Viro2008-07-275-16/+41
| * | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...David S. Miller2008-07-2720-78/+239
| |\ \
| * | | ipcomp: Fix warnings after ipcomp consolidation.David S. Miller2008-07-272-6/+2
* | | | Merge branch 'linus' into cpus4096Ingo Molnar2008-07-2868-239/+277
|\ \ \ \
| * | | | missing bits of net-namespace / sysctlAl Viro2008-07-275-16/+41
| | |/ / | |/| |
| * | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2008-07-266-24/+33
| |\ \ \
| | * | | [PATCH] f_count may wrap aroundAl Viro2008-07-263-12/+12
| | * | | [PATCH] sysctl: make sure that /proc/sys/net/ipv4 appears before per-ns onesAl Viro2008-07-262-0/+11
| | * | | [PATCH] beginning of sysctl cleanup - ctl_table_setAl Viro2008-07-261-12/+10
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-07-2660-204/+207
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | netns: fix ip_rt_frag_needed rt_is_expiredHugh Dickins2008-07-261-1/+1
| | * | netfilter: nf_conntrack_extend: avoid unnecessary "ct->ext" dereferencesPatrick McHardy2008-07-261-4/+4
| | * | netfilter: fix double-free and use-after freePekka Enberg2008-07-261-1/+1
| | * | netfilter: arptables in netns for realAlexey Dobriyan2008-07-261-9/+30
| | * | netfilter: ip{,6}tables_security: fix future section mismatchAlexey Dobriyan2008-07-262-2/+2
| | * | netfilter: ebtables: use nf_register_hooks()Alexey Dobriyan2008-07-262-26/+10
| | |/
| | * Revert "pkt_sched: sch_sfq: dump a real number of flows"David S. Miller2008-07-261-8/+1
| | * syncookies: Make sure ECN is disabledFlorian Westphal2008-07-262-0/+2
| | * net: convert BUG_TRAP to generic WARN_ONIlpo Järvinen2008-07-2550-153/+156
| * | SL*B: drop kmem cache argument from constructorAlexey Dobriyan2008-07-262-2/+2
| * | dma-mapping: add the device argument to dma_mapping_error()FUJITA Tomonori2008-07-261-1/+2
* | | cpumask: change cpumask_of_cpu_ptr to use new cpumask_of_cpuMike Travis2008-07-261-2/+1
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-07-258-608/+409
|\|
| * ipsec: ipcomp - Decompress into frags if necessaryHerbert Xu2008-07-251-6/+42
| * ipsec: ipcomp - Merge IPComp implementationsHerbert Xu2008-07-257-606/+371