summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2009-06-182-1/+34
|\
| * net: sk_wmem_alloc has initial value of one, not zeroEric Dumazet2009-06-171-0/+33
| * x25: Fix sleep from timer on socket destroy.David S. Miller2009-06-161-1/+1
* | Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/ve...Linus Torvalds2009-06-163-5/+16
|\ \ | |/ |/|
| * net: annotate struct sock bitfieldVegard Nossum2009-06-151-0/+2
| * net: annotate inet_timewait_sock bitfieldsVegard Nossum2009-06-151-1/+4
| * net: annotate bitfields in struct inet_sockVegard Nossum2009-06-151-4/+10
* | pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2USJarek Poplawski2009-06-151-4/+4
* | netfilter: conntrack: optional reliable conntrack event deliveryPablo Neira Ayuso2009-06-133-17/+48
* | netfilter: conntrack: move helper destruction to nf_ct_helper_destroy()Pablo Neira Ayuso2009-06-131-0/+2
* | netfilter: conntrack: move event caching to conntrack extension infrastructurePablo Neira Ayuso2009-06-133-64/+73
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...Patrick McHardy2009-06-1121-71/+529
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtma...David S. Miller2009-06-113-27/+52
| |\ \
| | * | Bluetooth: Add native RFKILL soft-switch support for all devicesMarcel Holtmann2009-06-081-0/+2
| | * | Bluetooth: Remove pointless endian conversion helpersMarcel Holtmann2009-06-081-6/+0
| | * | Bluetooth: Add basic constants for L2CAP ERTM support and use themMarcel Holtmann2009-06-081-21/+42
| | * | Bluetooth: Use macro for L2CAP hint mask on receiving config requestGustavo F. Padovan2009-06-081-0/+2
| | * | Bluetooth: Use macros for L2CAP channel identifiersGustavo F. Padovan2009-06-081-0/+6
| * | | net: No more expensive sock_hold()/sock_put() on each txEric Dumazet2009-06-111-1/+5
| * | | mac80211: do not pass PS frames out of mac80211 againJohannes Berg2009-06-101-0/+3
| * | | net: add NL802154 interface for configuration of 802.15.4 devicesSergey Lapin2009-06-091-0/+41
| * | | net: add IEEE 802.15.4 socket family implementationSergey Lapin2009-06-093-0/+335
| * | | pkt_sched: Change PSCHED_SHIFT from 10 to 6Jarek Poplawski2009-06-091-2/+2
| * | | pkt_sched: Use PSCHED_SHIFT in PSCHED time conversionJarek Poplawski2009-06-091-2/+3
| * | | bluetooth: Kill skb_frags_no(), unused.David S. Miller2009-06-081-9/+0
| |/ /
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2009-06-073-17/+68
| |\ \
| | * | cfg80211: add rfkill supportJohannes Berg2009-06-032-7/+42
| | * | cfg80211: move txpower wext from mac80211Johannes Berg2009-06-031-0/+30
| | * | rfkill: rewriteJohannes Berg2009-06-031-6/+2
| | * | mac80211: deprecate conf.beacon_int properlyJohannes Berg2009-06-031-12/+2
| * | | sctp: support non-blocking version of the new sctp_connectx() APIVlad Yasevich2009-06-031-0/+2
| * | | sctp: fix to choose alternate destination when retransmit ASCONF chunkWei Yongjun2009-06-031-4/+2
| |/ /
| * | net: skb->dst accessorsEric Dumazet2009-06-035-8/+14
| * | net: skb->rtable accessorEric Dumazet2009-06-031-1/+1
| * | ipv4: New multicast-all socket optionNivedita Singhvi2009-06-021-1/+2
* | | netfilter: nf_conntrack: use per-conntrack locks for protocol dataPatrick McHardy2009-06-102-2/+4
* | | netfilter: nf_ct_icmp: keep the ICMP ct entries longerJan Kasprzak2009-06-083-21/+0
* | | netfilter: conntrack: replace notify chain by function pointerPablo Neira Ayuso2009-06-031-20/+48
* | | netfilter: conntrack: simplify event caching systemPablo Neira Ayuso2009-06-021-30/+6
* | | netfilter: conntrack: remove events flags from userspace exposed filePablo Neira Ayuso2009-06-021-0/+69
* | | netfilter: conntrack: don't report events on module removalPablo Neira Ayuso2009-06-021-1/+1
* | | netfilter: ctnetlink: rename tuple() by nf_ct_tuple() macro definitionPablo Neira Ayuso2009-06-021-0/+2
* | | netfilter: conntrack: add support for DCCP handshake sequence to ctnetlinkPablo Neira Ayuso2009-05-271-0/+9
|/ /
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2009-05-252-41/+66
|\ \
| * | wireless: move some utility functions from mac80211 to cfg80211Zhu Yi2009-05-222-28/+47
| * | mac80211: fix kernel-docJohannes Berg2009-05-201-1/+0
| * | cfg80211: allow wext to remove keys that don't existJohannes Berg2009-05-201-2/+3
| * | cfg80211: mark wiphy->privid as pointer to constDavid Kilroy2009-05-201-1/+1
| * | cfg80211: mark ops as pointer to constDavid Kilroy2009-05-201-1/+1
| * | wireless: rename IEEE80211_CHAN_NO_FAT_* to HT40-/+Luis R. Rodriguez2009-05-201-5/+5
OpenPOWER on IntegriCloud