aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into upstreamJeff Garzik2006-06-133-3/+3
|\
| * [IPV4]: Increment ipInHdrErrors when TTL expires.Weidong2006-06-121-0/+1
| * [TCP]: continued: reno sacked_out count fixAki M Nyrhinen2006-06-111-3/+1
| * [DCCP] Ackvec: fix soft lockup in ackvec handling codeAndrea Bittau2006-06-111-0/+1
* | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linv...Jeff Garzik2006-06-086-109/+125
|\ \
| * | [PATCH] softmac: unified capabilities computationJoseph Jezak2006-06-051-32/+53
| * | [PATCH] softmac: Fix handling of authentication failureDaniel Drake2006-06-052-4/+23
| * | [PATCH] softmac: complete shared key authenticationDaniel Drake2006-06-054-28/+49
| * | [PATCH] ieee80211softmac_io.c: fix warning "defined but not used"Toralf Förster2006-06-051-45/+0
| * | Merge branch 'from-linus' into upstreamJohn W. Linville2006-06-057-19/+30
| |\ \
| * \ \ Merge branch 'from-linus' into upstreamJohn W. Linville2006-05-269-30/+37
| |\ \ \
* | \ \ \ Merge branch 'master' into upstreamJeff Garzik2006-06-0811-48/+22
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | [BRIDGE]: fix locking and memory leak in br_add_bridgeJiri Benc2006-06-051-12/+7
| * | | | [IRDA]: Missing allocation result check in irlap_change_speed().Florin Malita2006-06-051-1/+2
| * | | | [NET]: Eliminate unused /proc/sys/net/ethernetJes Sorensen2006-06-053-23/+0
| * | | | [TCP]: Avoid skb_pull if possible when trimming headHerbert Xu ~{PmVHI~}2006-06-051-7/+5
| | |_|/ | |/| |
| * | | [TCP] tcp_highspeed: Fix problem observed by Xiaoliang (David) WeiStephen Hemminger2006-06-021-1/+2
| * | | [NETFILTER]: PPTP helper: fix sstate/cstate typoAlexey Dobriyan2006-05-281-2/+2
| * | | [NETFILTER]: mark H.323 helper experimentalPatrick McHardy2006-05-281-2/+2
| * | | [NETFILTER]: Fix small information leak in SO_ORIGINAL_DST (CVE-2006-1343)Marcel Holtmann2006-05-282-0/+2
* | | | Merge branch 'upstream-fixes' into upstreamJeff Garzik2006-05-262-14/+22
|\ \ \ \ | |/ / /
| * | | [NET]: dev.c comment fixesStephen Hemminger2006-05-261-9/+11
| * | | [IPV6] ROUTE: Don't try less preferred routes for on-link routes.YOSHIFUJI Hideaki2006-05-261-5/+11
| | |/ | |/|
* | | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linv...Jeff Garzik2006-05-246-60/+146
|\ \ \ | | |/ | |/|
| * | Merge branch 'from-linus' into upstreamJohn W. Linville2006-05-2218-127/+188
| |\ \
| * \ \ Merge branch 'from-linus' into upstreamJohn W. Linville2006-05-1720-153/+183
| |\ \ \
| * | | | [PATCH] softmac: suggest per-frame-type TX rateDaniel Drake2006-05-054-35/+108
| * | | | [PATCH] ieee80211_wx.c: remove dead codeAdrian Bunk2006-05-051-1/+1
| * | | | [PATCH] softmac: deauthentication implies deassociationDaniel Drake2006-05-054-24/+37
| * | | | Merge branch 'upstream-fixes' into upstreamJohn W. Linville2006-05-054-4/+41
| |\ \ \ \
| * \ \ \ \ Merge branch 'from-linus' into upstreamJohn W. Linville2006-05-0541-172/+200
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'master' into upstreamJeff Garzik2006-05-243-17/+23
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | [BRIDGE]: need to ref count the LLC sapStephen Hemminger2006-05-231-1/+2
| * | | | | | [NETFILTER]: SNMP NAT: fix memleak in snmp_object_decodeChris Wright2006-05-231-0/+1
| * | | | | | [NETFILTER]: H.323 helper: fix sequence extension parsingPatrick McHardy2006-05-231-1/+1
| * | | | | | [NETFILTER]: H.323 helper: fix parser error propagationPatrick McHardy2006-05-231-15/+19
* | | | | | | Merge branch 'master' into upstreamJeff Garzik2006-05-237-13/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-05-236-13/+13
| |\ \ \ \ \ \
| | * | | | | | [NETFILTER]: SNMP NAT: fix memory corruptionPatrick McHardy2006-05-221-8/+7
| | * | | | | | [IRDA]: fix 16/32 bit confusionAlexey Dobriyan2006-05-221-1/+2
| | * | | | | | [NET]: Fix "ntohl(ntohs" bugsAlexey Dobriyan2006-05-224-4/+4
| | | |_|_|_|/ | | |/| | | |
| * | | | | | [PATCH] knfsd: Fix two problems that can cause rmmod nfsd to dieNeilBrown2006-05-231-0/+1
| |/ / / / /
* | | | | | Merge branch 'master' into upstreamJeff Garzik2006-05-2064-389/+554
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [SCTP]: Allow linger to abort 1-N style sockets.Vladislav Yasevich2006-05-191-6/+6
| * | | | | [SCTP]: Validate the parameter length in HB-ACK chunk.Vladislav Yasevich2006-05-191-0/+6
| * | | | | [SCTP]: A better solution to fix the race between sctp_peeloff() andVladislav Yasevich2006-05-192-67/+89
| * | | | | [SCTP]: Set sk_err so that poll wakes up after a non-blocking connect failure.Sridhar Samudrala2006-05-194-33/+63
| * | | | | [NETFILTER]: nfnetlink_log: fix byteorder confusionPatrick McHardy2006-05-191-2/+2
| * | | | | [NETFILTER]: Fix do_add_counters race, possible oops or info leak (CVE-2006-0...Solar Designer2006-05-192-2/+2
| * | | | | [NETFILTER]: GRE conntrack: fix htons/htonl confusionAlexey Dobriyan2006-05-191-6/+6