summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linv...Jeff Garzik2006-03-013-26/+17
|\
| * [PATCH] ieee80211_geo.c: remove frivolous BUG_ON'sPete Zaitcev2006-02-271-3/+6
| * Merge branch 'upstream-fixes'John W. Linville2006-02-271-11/+5
| |\
| * \ Merge branch 'from-linus'John W. Linville2006-02-2713-49/+54
| |\ \
| * | | [PATCH] ieee80211: fix sparse warning about missing "static"Johannes Berg2006-02-171-1/+1
| * | | [PATCH] ieee80211: Use IWEVGENIE to set WPA IEZhu Yi2006-02-171-22/+10
| * | | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgar...John W. Linville2006-02-1713-79/+385
| |\ \ \
* | \ \ \ Merge branch 'upstream-fixes'Jeff Garzik2006-03-018-163/+109
|\ \ \ \ \
| * \ \ \ \ Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Jeff Garzik2006-02-281-11/+5
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | [PATCH] ieee80211_rx.c: is_beaconPete Zaitcev2006-02-271-11/+5
| | | |_|/ | | |/| |
| * | | | [REQSK]: Don't reset rskq_defer_accept in reqsk_queue_allocArnaldo Carvalho de Melo2006-02-271-1/+0
| * | | | [NETFILTER]: Restore {ipt,ip6t,ebt}_LOG compatibilityPatrick McHardy2006-02-273-3/+18
| * | | | [NETFILTER]: nf_queue: fix end-of-list checkPatrick McHardy2006-02-271-1/+1
| * | | | [NETFILTER]: nf_queue: remove unnecessary check for outfnPatrick McHardy2006-02-271-1/+1
| * | | | [NETFILTER]: nf_queue: fix rerouting after packet manglingPatrick McHardy2006-02-271-7/+15
| * | | | [NETFILTER]: nf_queue: check if rerouter is present before using itPatrick McHardy2006-02-271-2/+2
| * | | | [NETFILTER]: nf_queue: don't copy registered rerouter dataPatrick McHardy2006-02-271-19/+9
| * | | | [IPSEC]: Kill post_input hook and do NAT-T in esp_input directlyHerbert Xu2006-02-272-97/+38
| * | | | [IPSEC] esp: Kill unnecessary block and indentationHerbert Xu2006-02-271-44/+43
| |/ / /
* | | | Merge branch 'master'Jeff Garzik2006-02-2710-19/+36
|\ \ \ \ | |/ / /
| * | | [IPV6]: Do not ignore IPV6_MTU socket option.YOSHIFUJI Hideaki2006-02-241-2/+13
| * | | [IPV6] ip6_tunnel: release cached dst on change of tunnel paramsHugo Santos2006-02-241-0/+1
| * | | [IPSEC]: Use TOS when doing tunnel lookupsHerbert Xu2006-02-231-1/+4
| * | | [NET] ethernet: Fix first packet goes out with MAC 00:00:00:00:00:00Jamal Hadi Salim2006-02-231-6/+6
| * | | [XFRM]: Eliminate refcounting confusion by creating __xfrm_state_put().Herbert Xu2006-02-233-6/+6
| * | | [IPV4]: Fix garbage collection of multipath route entriesSuresh Bhogavilli2006-02-231-1/+1
| * | | [NETFILTER]: Fix bridge netfilter related in xfrm_lookupPatrick McHardy2006-02-232-3/+5
* | | | Merge branch 'upstream-fixes'Jeff Garzik2006-02-235-30/+18
|\ \ \ \ | |/ / /
| * | | Merge branch 'fixes.b8' of git://git.kernel.org/pub/scm/linux/kernel/git/viro...Linus Torvalds2006-02-201-1/+1
| |\ \ \
| | * | | [PATCH] missing ntohs() in ip6_tunnelAl Viro2006-02-181-1/+1
| | |/ /
| * | | [NET]: NETFILTER: remove duplicated lines and fix order in skb_clone().YOSHIFUJI Hideaki2006-02-191-7/+3
| * | | [NETFILTER]: Fix outgoing redirects to loopbackPatrick McHardy2006-02-191-11/+5
| * | | [NETFILTER]: Fix NAT PMTUD problemsPatrick McHardy2006-02-191-9/+9
| * | | [XFRM]: Fix policy double putPatrick McHardy2006-02-191-2/+0
| |/ /
* | | Merge branch 'upstream-fixes'Jeff Garzik2006-02-1736-204/+327
|\ \ \ | |/ / | | / | |/ |/|
| * [NETFILTER]: nf_conntrack: Fix TCP/UDP HW checksum handling for IPv6 packetYasuyuki Kozakai2006-02-152-2/+6
| * [NETFILTER]: nf_conntrack: attach conntrack to locally generated ICMPv6 errorYasuyuki Kozakai2006-02-151-0/+6
| * [NETFILTER]: nf_conntrack: attach conntrack to TCP RST generated by ip6t_REJECTYasuyuki Kozakai2006-02-151-0/+2
| * [NETFILTER]: nf_conntrack: move registration of __nf_ct_attachYasuyuki Kozakai2006-02-152-5/+5
| * [NETFILTER]: x_tables: fix dependencies of conntrack related modulesYasuyuki Kozakai2006-02-151-3/+3
| * [XFRM]: Fix SNAT-related crash in xfrm4_output_finishPatrick McHardy2006-02-154-11/+24
| * [BRIDGE]: Fix deadlock in br_stp_disable_bridgeAdrian Drzewiecki2006-02-151-2/+2
| * [NETFILTER]: Fix xfrm lookup after SNATPatrick McHardy2006-02-152-3/+44
| * [NET]: Revert skb_copy_datagram_iovec() recursion elimination.David S. Miller2006-02-131-28/+53
| * [IPSEC]: Fix strange IPsec freeze.Herbert Xu2006-02-131-1/+3
| * [IPV6] Don't store dst_entry for RAW socketNicolas DICHTEL2006-02-131-4/+1
| * [NETLINK] genetlink: Fix bugs spotted by Andrew Morton.Jamal Hadi Salim2006-02-131-7/+4
| * [BRIDGE]: Better fix for netfilter missing symbol has_bridge_parentStephen Hemminger2006-02-131-2/+2
| * [NETFILTER] Fix Kconfig menu level for x_tablesHarald Welte2006-02-131-2/+2
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6David S. Miller2006-02-132-6/+17
| |\
OpenPOWER on IntegriCloud