aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into upstreamJeff Garzik2006-09-2221-319/+443
|\
| * [CRYPTO] users: Use crypto_comp and crypto_has_*Herbert Xu2006-09-213-33/+44
| * [CRYPTO] users: Use crypto_hash interface instead of crypto_digestHerbert Xu2006-09-212-25/+38
| * [SCTP]: Use HMAC template and hash interfaceHerbert Xu2006-09-213-14/+31
| * [IPSEC]: Use HMAC template and hash interfaceHerbert Xu2006-09-215-70/+119
| * [CRYPTO] users: Use block ciphers where applicableHerbert Xu2006-09-213-43/+48
| * [SUNRPC] GSS: Use block ciphers where applicableHerbert Xu2006-09-215-54/+64
| * [IPSEC] ESP: Use block ciphers where applicableHerbert Xu2006-09-215-48/+75
| * [IPSEC]: Add compatibility algorithm name supportHerbert Xu2006-09-212-1/+3
| * [IPSEC]: Move linux/crypto.h inclusion out of net/xfrm.hHerbert Xu2006-09-211-0/+1
* | Merge branch 'master' into upstreamJeff Garzik2006-09-202-4/+6
|\ \ | |/
| * [IPV4] fib_trie: missing ntohl() when calling fib_semantic_match()Al Viro2006-09-191-4/+4
| * [NETFILTER]: xt_quota: add missing module aliasesPatrick McHardy2006-09-191-0/+2
* | Merge branch 'master' into upstreamJeff Garzik2006-09-1913-41/+50
|\ \ | |/
| * [ATM] CLIP: Do not refer freed skbuff in clip_mkip().YOSHIFUJI Hideaki2006-09-181-0/+2
| * [NET]: Drop tx lock in dev_watchdog_upHerbert Xu2006-09-181-2/+0
| * [PACKET]: Don't truncate non-linear skbs with mmaped IOPatrick McHardy2006-09-171-3/+1
| * [NET]: Mark frame diverter for future removal.Stephen Hemminger2006-09-171-1/+1
| * [TCP] tcp-lp: bug fix for oops in 2.6.18-rc6Wong Hoi Sing Edison2006-09-171-14/+21
| * [BRIDGE]: random extra bytes on STP TCN packetStephen Hemminger2006-09-171-1/+1
| * [IPV6]: Accept -1 for IPV6_TCLASSRemi Denis-Courmont2006-09-172-2/+4
| * [IPV6]: Fix tclass setting for raw sockets.YOSHIFUJI Hideaki2006-09-172-3/+3
| * [IPVS]: remove the debug option go ip_vs_ftpSimon Horman2006-09-171-14/+6
| * [IPVS]: Make sure ip_vs_ftp ports are validSimon Horman2006-09-171-0/+6
| * [IPVS]: auto-help for ip_vs_ftpSimon Horman2006-09-171-0/+1
| * [TCP]: Turn ABC off.Stephen Hemminger2006-09-171-1/+1
| * [NEIGH]: neigh_table_clear() doesn't free statsKirill Korotaev2006-09-171-0/+3
* | [PATCH] ethtool: allow const ethtool_opsStephen Hemminger2006-09-131-7/+7
* | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linvil...Jeff Garzik2006-09-065-60/+132
|\ \
| * | [PATCH] ieee80211: Workaround malformed 802.11 frames from APZhu Yi2006-08-291-7/+10
| * | [PATCH] ieee80211: Fix TKIP and WEP decryption error on SMP machinesZhu Yi2006-08-292-41/+84
| * | [PATCH] ieee80211: TKIP and CCMP replay check reworkZhu Yi2006-08-292-3/+36
| * | [PATCH] ieee80211: remove ieee80211_tx() is_queue_full warningZhu Yi2006-08-291-7/+0
| * | [PATCH] ieee80211: Fix header->qos_ctl endian issueZhu Yi2006-08-292-2/+2
| * | Merge branch 'from-linus' into upstreamJohn W. Linville2006-08-2920-299/+273
| |\ \
| * \ \ Merge branch 'from-linus' into upstreamJohn W. Linville2006-08-2213-75/+91
| |\ \ \
| * \ \ \ Merge branch 'from-linus' into upstreamJohn W. Linville2006-08-1431-119/+249
| |\ \ \ \
| * \ \ \ \ Merge branch 'upstream-fixes' into upstreamJohn W. Linville2006-08-041-1/+23
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'from-linus' into upstreamJohn W. Linville2006-08-0427-122/+430
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'master' into upstreamJeff Garzik2006-09-049-30/+46
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | [IPV4]: Fix SNMPv2 "ipFragFails" counter errorWei Dong2006-08-311-0/+1
| * | | | | | | [NET]: Rate limiting for socket allocation failure messages.Akinobu Mita2006-08-311-1/+2
| * | | | | | | [IPV6]: Fix kernel OOPs when setting sticky socket options.YOSHIFUJI Hideaki2006-08-311-13/+16
| * | | | | | | [IPV6]: ipv6_add_addr should install dstentry earlierKeir Fraser2006-08-291-2/+2
| * | | | | | | [NETLINK]: Call panic if nl_table allocation failsAkinobu Mita2006-08-291-8/+6
| * | | | | | | [TCP]: Two RFC3465 Appropriate Byte Count fixes.Daikichi Osuga2006-08-292-3/+8
| * | | | | | | [IPV6]: SNMPv2 "ipv6IfStatsInAddrErrors" counter errorLv Liangying2006-08-291-0/+4
| * | | | | | | [SCTP]: Fix sctp_primitive_ABORT() call in sctp_close().Sridhar Samudrala2006-08-291-3/+7
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'master' into upstreamJeff Garzik2006-08-2920-299/+273
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [DCCP]: Fix CCID3Ian McDonald2006-08-266-193/+154