summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6David S. Miller2011-05-101-0/+17
|\
| * IPVS: init and cleanup restructuringHans Schillstrom2011-05-101-0/+17
* | xfrm: Assign the inner mode output function to the dst entrySteffen Klassert2011-05-101-0/+3
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-04-113-5/+17
|\
| * ipv4: Fix "Set rt->rt_iif more sanely on output routes."OGAWA Hirofumi2011-04-071-2/+3
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-04-061-2/+13
| |\
| | * mac80211: fix comment regarding aggregation buf_sizeJohannes Berg2011-04-041-2/+13
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-04-051-1/+1
| |\ \ | | |/ | |/|
| | * IPVS: fix NULL ptr dereference in ip_vs_ctl.c ip_vs_genl_dump_daemons()Hans Schillstrom2011-04-041-1/+1
* | | Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6Linus Torvalds2011-04-0716-20/+20
|\ \ \ | |/ / |/| |
| * | Fix common misspellingsLucas De Marchi2011-03-3116-20/+20
* | | sctp: fix auth_hmacs field's length of struct sctp_cookieWei Yongjun2011-04-011-1/+1
| |/ |/|
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-04-011-0/+2
|\ \
| * | Bluetooth: Fix HCI_RESET command synchronizationGustavo F. Padovan2011-03-241-0/+2
* | | net: gre: provide multicast mappings for ipv4 and ipv6Timo Teräs2011-03-302-0/+24
| |/ |/|
* | xfrm: Assign esn pointers when cloning a stateSteffen Klassert2011-03-281-0/+22
* | rose: Add length checks to CALL_REQUEST parsingBen Hutchings2011-03-271-1/+7
* | dst: Clone child entry in skb_dst_popSteffen Klassert2011-03-271-1/+1
* | route: Take the right src and dst addresses in ip_route_newportsSteffen Klassert2011-03-251-2/+2
* | ipv4: Fix nexthop caching wrt. scoping.David S. Miller2011-03-241-3/+3
* | ipv4: Invalidate nexthop cache nh_saddr more correctly.David S. Miller2011-03-242-2/+11
* | net_sched: fix THROTTLED/RUNNING raceEric Dumazet2011-03-241-4/+4
* | ipv6: ip6_route_output does not modify sk parameter, so make it constFlorian Westphal2011-03-221-1/+1
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-03-222-2/+3
|\|
| * wireless: fix 80211 kernel-doc warningsRandy Dunlap2011-03-212-2/+3
* | ipv4: fix route deletion for IPs on many subnetsJulian Anastasov2011-03-221-0/+1
* | IPVS: Use global mutex in ip_vs_app.cSimon Horman2011-03-211-2/+0
* | snmp: SNMP_UPD_PO_STATS_BH() always called from softirqEric Dumazet2011-03-211-2/+2
* | xfrm: Fix initialize repl field of struct xfrm_stateWei Yongjun2011-03-211-0/+1
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-03-1649-533/+1950
|\
| * Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2011-03-152-0/+15
| |\
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-03-152-0/+15
| | |\
| | | * mac80211: implement support for cfg80211_ops->{get,set}_ringparamJohn W. Linville2011-03-111-0/+7
| | | * wireless: add support for ethtool_ops->{get,set}_ringparamJohn W. Linville2011-03-111-0/+8
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-03-153-163/+180
| |\ \ \ | | |/ / | |/| |
| | * | IPVS: Conditionally include sysctl members of struct netns_ipvsSimon Horman2011-03-151-8/+13
| | * | IPVS: Conditional ip_vs_conntrack_enabled()Simon Horman2011-03-151-0/+4
| | * | IPVS: ip_vs_todrop() becomes a noop when CONFIG_SYSCTL is undefinedSimon Horman2011-03-151-0/+4
| | * | IPVS: Add sysctl_sync_ver()Simon Horman2011-03-151-0/+11
| | * | IPVS: Add {sysctl_sync_threshold,period}()Simon Horman2011-03-151-0/+29
| | * | ipvs: rename estimator functionsJulian Anastasov2011-03-151-2/+2
| | * | ipvs: optimize rates readingJulian Anastasov2011-03-151-0/+2
| | * | ipvs: remove unused seqcount statsJulian Anastasov2011-03-151-17/+0
| | * | ipvs: properly zero stats and ratesJulian Anastasov2011-03-151-0/+1
| | * | ipvs: reorganize tot_statsJulian Anastasov2011-03-151-2/+1
| | * | ipvs: move struct netns_ipvsJulian Anastasov2011-03-153-144/+123
| | * | IPVS: Fix variable assignment in ip_vs_notrackJesper Juhl2011-03-151-1/+1
| * | | xfrm: Add support for IPsec extended sequence numbersSteffen Klassert2011-03-131-0/+1
| * | | xfrm: Move IPsec replay detection functions to a separate fileSteffen Klassert2011-03-131-4/+20
| * | | xfrm: Use separate low and high order bits of the sequence numbers in xfrm_sk...Steffen Klassert2011-03-131-2/+8