summaryrefslogtreecommitdiffstats
path: root/include/net (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into upstreamJeff Garzik2006-06-2333-36/+5
|\
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-06-212-4/+5
| |\
| | * [SCTP]: Fix unintentional change to SCTP_ASSERT when !SCTP_DEBUGDavid S. Miller2006-06-201-1/+1
| | * [NET]: Prevent multiple qdisc runsHerbert Xu2006-06-201-3/+4
| * | Merge git://git.infradead.org/hdrcleanup-2.6Linus Torvalds2006-06-2132-32/+0
| |\ \ | | |/ | |/|
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...David Woodhouse2006-05-246-7/+12
| | |\
| | * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6David Woodhouse2006-05-066-18/+19
| | |\ \
| | * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6David Woodhouse2006-04-291-1/+4
| | |\ \ \
| | * | | | Don't include linux/config.h from anywhere else in include/David Woodhouse2006-04-2632-32/+0
* | | | | | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linv...Jeff Garzik2006-06-201-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [PATCH] wireless: Changes to ieee80211.h for user space regulatory daemonLarry Finger2006-06-151-2/+3
* | | | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-06-2011-26/+135
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [SCTP] Reset rtt_in_progress for the chunk when processing its sack.Vlad Yasevich2006-06-181-1/+1
| * | | | | [SCTP]: Reject sctp packets with broadcast addresses.Vlad Yasevich2006-06-181-1/+2
| * | | | | [TCP]: Add tcp_slow_start_after_idle sysctl.David S. Miller2006-06-181-0/+1
| * | | | | [NET]: net.ipv4.ip_autoconfig sysctl removalStephen Hemminger2006-06-181-1/+0
| * | | | | [NET]: skb_trim auditHerbert Xu2006-06-181-4/+1
| * | | | | [SECMARK]: Add secmark support to conntrackJames Morris2006-06-182-0/+30
| * | | | | [IPV4]: Right prototype of __raw_v4_lookup()Alexey Dobriyan2006-06-181-1/+1
| * | | | | [TCP]: Minimum congestion window consolidation.Stephen Hemminger2006-06-181-2/+2
| * | | | | [NETFILTER]: conntrack: add sysctl to disable checksummingPatrick McHardy2006-06-181-0/+1
| * | | | | [IPSEC] xfrm: Use IPPROTO_MAX instead of 256Herbert Xu2006-06-181-1/+1
| * | | | | [IPSEC] xfrm: Abstract out encapsulation modesHerbert Xu2006-06-181-0/+17
| * | | | | [IPSEC] xfrm: Undo afinfo lock proliferationHerbert Xu2006-06-181-8/+1
| * | | | | [LLC]: add multicast support for datagramsStephen Hemminger2006-06-181-0/+4
| * | | | | [LLC]: use more efficient ether address routinesStephen Hemminger2006-06-181-7/+6
| * | | | | [I/OAT]: Add a sysctl for tuning the I/OAT offloaded I/O thresholdChris Leech2006-06-181-0/+1
| * | | | | [I/OAT]: Make sk_eat_skb I/OAT aware.Chris Leech2006-06-181-1/+12
| * | | | | [I/OAT]: Rename cleanup_rbuf to tcp_cleanup_rbuf and make non-staticChris Leech2006-06-181-0/+2
| * | | | | [I/OAT]: Structure changes for TCP recv offload to I/OATChris Leech2006-06-182-0/+9
| * | | | | [I/OAT]: Utility functions for offloading sk_buff to iovec copiesChris Leech2006-06-181-0/+6
| * | | | | [I/OAT]: Setup the networking subsystem as a DMA clientChris Leech2006-06-181-0/+38
* | | | | | [PATCH] softmac: Fix handling of authentication failureDaniel Drake2006-06-051-1/+1
* | | | | | [PATCH] softmac: complete shared key authenticationDaniel Drake2006-06-051-1/+2
* | | | | | Merge branch 'from-linus' into upstreamJohn W. Linville2006-06-051-1/+2
|\| | | | |
| * | | | | [PATCH] net/compat.h build fixAndrew Morton2006-06-011-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'from-linus' into upstreamJohn W. Linville2006-05-261-1/+1
|\| | | |
| * | | | [IRDA]: fixup type of ->lsap_stateAlexey Dobriyan2006-05-231-1/+1
* | | | | Merge branch 'from-linus' into upstreamJohn W. Linville2006-05-222-3/+4
|\| | | |
| * | | | [SCTP]: Respect the real chunk length when walking parameters.Vladislav Yasevich2006-05-191-3/+3
| * | | | [SCTP]: Set sk_err so that poll wakes up after a non-blocking connect failure.Sridhar Samudrala2006-05-191-0/+1
* | | | | Merge branch 'from-linus' into upstreamJohn W. Linville2006-05-172-0/+2
|\| | | |
| * | | | [NEIGH]: Fix IP-over-ATM and ARP interaction.Simon Kelley2006-05-121-0/+1
| * | | | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Stephen Hemminger2006-05-092-3/+6
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | [SCTP]: Allow spillover of receive buffer to avoid deadlock.Neil Horman2006-05-061-0/+1
* | | | | [PATCH] softmac: suggest per-frame-type TX rateDaniel Drake2006-05-051-5/+33
* | | | | Merge branch 'upstream-fixes' into upstreamJohn W. Linville2006-05-052-3/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [PATCH] ieee80211: Fix A band channel count (resent)Jean Delvare2006-05-051-2/+4
| * | | | [PATCH] softmac: make non-operational after being stoppedDaniel Drake2006-05-051-1/+2
| |/ / /
* | | | Merge branch 'from-linus' into upstreamJohn W. Linville2006-05-055-18/+18
|\| | |