aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* pkt_action: add new action skbeditAlexander Duyck2008-09-121-0/+34
* mac80211: make conf_tx non-atomicJohannes Berg2008-09-111-1/+1
* ipsec: Use RCU-like construct for saved state within a walkHerbert Xu2008-09-091-10/+5
* Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2008-09-091-70/+238
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into l...Simon Horman2008-09-102-0/+6
| |\
| * | ipvs: Embed user stats structure into kernel stats structureSven Wegener2008-09-091-19/+2
| * | ipvs: Restrict connection table size via KconfigSven Wegener2008-09-091-9/+1
| * | IPVS: Adjust various debug outputs to use new macrosJulius Volz2008-09-051-20/+33
| * | IPVS: Convert real server lookup functionsJulius Volz2008-09-051-3/+5
| * | IPVS: Add and bind IPv6 xmit functionsJulius Volz2008-09-051-1/+19
| * | IPVS: Extend functions for getting/creating connectionsJulius Volz2008-09-051-5/+11
| * | IPVS: Extend protocol DNAT/SNAT and state handlersJulius Volz2008-09-051-0/+11
| * | IPVS: Add 'af' args to protocol handler functionsJulius Volz2008-09-051-6/+9
| * | IPVS: Add IPv6 support flag to schedulersJulius Volz2008-09-051-0/+3
| * | IPVS: Add v6 support to ip_vs_service_get()Julius Volz2008-09-051-1/+2
| * | IPVS: Add internal versions of sockopt interface structsJulius Volz2008-09-051-0/+39
| * | IPVS: Add debug macros for v4 and v6 address outputJulius Volz2008-09-051-0/+42
| * | IPVS: Add general v4/v6 helper functions / data structuresJulius Volz2008-09-051-0/+49
| * | IPVS: Change IPVS data structures to support IPv6 addressesJulius Volz2008-09-051-6/+12
* | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2008-09-091-1/+2
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtma...David S. Miller2008-09-091-1/+2
| |\ \
| | * | [Bluetooth] Reject L2CAP connections on an insecure ACL linkMarcel Holtmann2008-09-091-0/+1
| | * | [Bluetooth] Enforce correct authentication requirementsMarcel Holtmann2008-09-091-1/+1
* | | | This reverts "Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_exp"Gerrit Renker2008-09-091-15/+0
* | | | Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_expDavid S. Miller2008-09-081-0/+15
|\ \ \ \
| * | | | tcp/dccp: Consolidate common code for RFC 3390 conversionGerrit Renker2008-09-041-0/+15
| | |/ / | |/| |
* | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...David S. Miller2008-09-081-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | netns : fix kernel panic in timewait socket destructionDaniel Lezcano2008-09-081-0/+3
| |/ /
* | | cfg80211: keep track of supported interface modesLuis R. Rodriguez2008-09-051-0/+3
| |/ |/|
* | netlink: Remove compat API for nested attributesThomas Graf2008-09-021-82/+0
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2008-08-292-2/+11
|\ \ | |/
| * pkt_sched: Fix sch_tree_lock()Jarek Poplawski2008-08-271-2/+2
| * pkt_sched: Fix gen_estimator locksJarek Poplawski2008-08-271-0/+8
| * pkt_sched: Fix qdisc list lockingJarek Poplawski2008-08-221-0/+1
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2008-08-292-0/+32
|\ \
| * | mac80211/cfg80211: HT capabilities for NEW_STAJouni Malinen2008-08-291-0/+1
| * | mac80211/cfg80211: Add BSS configuration options for AP modeJouni Malinen2008-08-292-0/+31
* | | net: more #ifdef CONFIG_COMPATAlexey Dobriyan2008-08-282-0/+4
|/ /
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/...Simon Horman2008-08-271-0/+2
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...Simon Horman2008-08-192-9/+4
| |\ \
| * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...Simon Horman2008-08-162-1/+3
| |\ \ \
| * | | | ipvs: Create init functions for estimator codeSven Wegener2008-08-151-0/+2
* | | | | mac80211: remove ieee80211_get_hdrlenHarvey Harrison2008-08-221-10/+0
* | | | | mac80211: add rx status flag for short preambleBruno Randolf2008-08-221-0/+2
* | | | | mac80211: add ieee80211_queue_stopped)Tomas Winkler2008-08-221-0/+10
| |_|_|/ |/| | |
* | | | pkt_sched: Fix qdisc_watchdog() vs. dev_deactivate() raceJarek Poplawski2008-08-211-0/+5
| |_|/ |/| |
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2008-08-181-8/+3
|\ \ \
| * | | mac80211: remove kdoc references to IEEE80211_HW_HOST_GEN_BEACON_TEMPLATELuis R. Rodriguez2008-08-181-8/+3
| | |/ | |/|
* | | pkt_sched: No longer destroy qdiscs from RCU.David S. Miller2008-08-171-1/+0
* | | pkt_sched: Add 'deactivated' state.David S. Miller2008-08-171-0/+1
|/ /