summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-09-022-13/+33
|\
| * mac80211: support runtime interface type changesJohannes Berg2010-08-271-0/+9
| * cfg80211: allow changing port control protocolJohannes Berg2010-08-271-7/+17
| * mac80211: allow scan to complete from any contextJohannes Berg2010-08-271-1/+2
| * mac80211: trivial spelling fixesBob Copeland2010-08-251-5/+5
* | TCP: update initial windows according to RFC 5681Gerrit Renker2010-08-301-8/+2
* | tcp/dccp: Consolidate common code for RFC 3390 conversionGerrit Renker2010-08-301-0/+15
* | tcp: Add TCP_USER_TIMEOUT socket option.Jerry Chu2010-08-301-0/+1
* | net/sctp: Use pr_fmt and pr_<level>Joe Perches2010-08-261-18/+30
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-08-252-45/+194
|\|
| * cfg80211: add some documentationJohannes Berg2010-08-241-6/+115
| * mac80211: fix docbookJohannes Berg2010-08-241-1/+1
| * cfg80211/mac80211: extensible frame processingJohannes Berg2010-08-241-22/+34
| * cfg80211: mark ieee80211_hdrlen constJohannes Berg2010-08-241-1/+1
| * mac80211: use cipher suite selectorsJohannes Berg2010-08-161-16/+2
| * mac80211: allow drivers to request SM PS mode changeJohannes Berg2010-08-161-0/+12
| * mac80211: per interface idle notificationJohannes Berg2010-08-161-0/+6
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-08-163-2/+148
| |\
| * | mac80211: support use of NAPI for bottom-half processingJohn W. Linville2010-08-161-0/+24
* | | irda: use net_device_stats from struct net_deviceEric Dumazet2010-08-211-1/+0
* | | PPTP: PPP over IPv4 (Point-to-Point Tunneling Protocol)Dmitry Kozlov2010-08-211-0/+18
* | | net/sched: add ACT_CSUM action to update packets checksumsGrégoire Baron2010-08-201-0/+15
* | | net: simplify flags for tx timestampingOliver Hartkopp2010-08-192-7/+3
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-08-101-2/+2
|\ \ \ | | |/ | |/|
| * | Bluetooth: Use 3-DH5 payload size for default ERTM max PDU sizeMat Martineau2010-08-101-1/+1
| * | Bluetooth: Change default L2CAP ERTM retransmit timeoutMat Martineau2010-08-101-1/+1
* | | net/sock.h: add missing kernel-doc notationRandy Dunlap2010-08-101-1/+3
|/ /
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-08-061-1/+1
|\|
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtma...John W. Linville2010-08-051-1/+1
| |\
| | * Bluetooth: Use list_head for HCI blacklist headDavid Miller2010-07-311-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-08-0455-599/+1021
|\| |
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-08-024-8/+25
| |\ \
| | * | netfilter: nf_nat: make unique_tuple return voidChangli Gao2010-08-021-4/+4
| | * | ipvs: provide default ip_vs_conn_{in,out}_get_protoSimon Horman2010-08-021-0/+12
| | * | netfilter: nf_conntrack_extend: introduce __nf_ct_ext_exist()Changli Gao2010-08-021-2/+7
| | * | IPVS: make FTP work with full NAT supportHannes Eder2010-07-231-2/+0
| | * | nfnetlink_log: do not expose NFULNL_COPY_DISABLED to user-spacePablo Neira Ayuso2010-07-151-0/+2
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-07-298-129/+219
| |\ \ \ | | | |/ | | |/|
| | * | cfg80211: fix dev <-> wiphy typoChristian Lamparter2010-07-291-1/+1
| | * | mac80211: allow drivers to request DTIM periodJohannes Berg2010-07-291-2/+7
| | * | mac80211: inform drivers about the off-channel status on channel changesFelix Fietkau2010-07-281-0/+3
| | * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtma...John W. Linville2010-07-281-0/+2
| | |\ \
| | | * | Bluetooth: Defer SCO setup if mode change is pendingMarcel Holtmann2010-07-271-0/+2
| | * | | wireless: Convert wiphy_debug macro to functionJoe Perches2010-07-271-2/+3
| | * | | include/net/cfg80211.h: Add wiphy_<level> printk equivalentsJoe Perches2010-07-271-1/+63
| | |/ /
| | * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtma...John W. Linville2010-07-2752-519/+889
| | |\ \
| | | * | Bluetooth: Use __packed annotationGustavo F. Padovan2010-07-214-113/+113
| | | * | Bluetooth: Add Google's copyright to L2CAPGustavo F. Padovan2010-07-211-0/+1
| | | * | Bluetooth: Implemented HCI frame reassembly for RX from streamSuraj Sumangala2010-07-211-0/+1
| | | * | Bluetooth: Implement hci_reassembly helper to reassemble RX packetsSuraj Sumangala2010-07-211-0/+1