summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mvebu/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git...Herbert Xu2015-06-192-3/+1
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-04-172-3/+1
| |\
| | * netns: remove BUG_ONs from net_generic()Denys Vlasenko2015-04-171-2/+0
| | * inet_diag: fix access to tcp cc informationEric Dumazet2015-04-171-1/+1
* | | ipsec: Add IV generator information to xfrm_stateHerbert Xu2015-05-281-0/+1
* | | xfrm: Add IV generator information to xfrm_algo_descHerbert Xu2015-05-281-0/+2
|/ /
* | Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2015-04-152-5/+5
|\ \ | |/ |/|
| * 9p: switch p9_client_read() to passing struct iov_iter *Al Viro2015-04-111-2/+1
| * 9p: switch p9_client_write() to passing it struct iov_iter *Al Viro2015-04-111-2/+3
| * net/9p: switch the guts of p9_client_{read,write}() to iov_iterAl Viro2015-04-111-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2015-04-142-32/+75
|\ \
| * | netfilter: nf_tables: mark stateful expressionsPatrick McHardy2015-04-131-0/+4
| * | netfilter: nf_tables: prepare for expressions associated to set elementsPatrick McHardy2015-04-131-0/+7
| * | netfilter: nf_tables: add helper functions for expression handlingPatrick McHardy2015-04-131-0/+13
| * | netfilter: nf_tables: variable sized set element keys / dataPatrick McHardy2015-04-131-1/+4
| * | netfilter: nf_tables: support variable sized data in nft_data_init()Patrick McHardy2015-04-131-1/+2
| * | netfilter: nf_tables: switch registers to 32 bit addressingPatrick McHardy2015-04-131-8/+5
| * | netfilter: nf_tables: add register parsing/dumping helpersPatrick McHardy2015-04-131-0/+3
| * | netfilter: nf_tables: convert sets to u32 data pointersPatrick McHardy2015-04-131-2/+2
| * | netfilter: nf_tables: kill nft_data_cmp()Patrick McHardy2015-04-131-7/+0
| * | netfilter: nf_tables: use struct nft_verdict within struct nft_dataPatrick McHardy2015-04-131-5/+2
| * | netfilter: nf_tables: get rid of NFT_REG_VERDICT usagePatrick McHardy2015-04-132-5/+31
| * | netfilter: nf_tables: introduce nft_validate_register_load()Patrick McHardy2015-04-131-2/+1
| * | netfilter: nf_tables: kill nft_validate_output_register()Patrick McHardy2015-04-131-1/+0
| * | netfilter: nf_tables: rename nft_validate_data_load()Patrick McHardy2015-04-131-3/+4
| * | netfilter: nf_tables: validate len in nft_validate_data_load()Patrick McHardy2015-04-131-1/+1
* | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...David S. Miller2015-04-132-2/+1
|\ \ \ | | |/ | |/|
| * | net: switch importing msghdr from userland to {compat_,}import_iovec()Al Viro2015-04-091-1/+1
| * | Merge branch 'iocb' into for-davemAl Viro2015-04-091-1/+0
| |\ \
| | * | fs: move struct kiocb to fs.hChristoph Hellwig2015-03-251-1/+0
* | | | tcp/dccp: get rid of central timewait timerEric Dumazet2015-04-131-98/+9
| |_|/ |/| |
* | | Merge tag 'mac80211-next-for-davem-2015-04-10' of git://git.kernel.org/pub/sc...David S. Miller2015-04-122-23/+136
|\ \ \
| * | | cfg80211: move IE split utilities here from mac80211Johannes Berg2015-04-072-28/+58
| * | | mac80211: add an intermediate software queue implementationFelix Fietkau2015-04-011-0/+83
* | | | rtnetlink: Mark name argument of rtnl_create_link() constThomas Graf2015-04-101-1/+1
* | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2015-04-093-7/+19
|\ \ \ \
| * | | | mac802154: fix transmission power datatypeVarka Bhadram2015-04-091-1/+1
| * | | | mac802154: fix typo for deviceVarka Bhadram2015-04-091-1/+1
| * | | | Bluetooth: Read LE remote features during connection establishmentMarcel Holtmann2015-04-091-0/+13
| * | | | Bluetooth: Update SSP OOB data EIR definitionsJohan Hedberg2015-04-071-2/+4
| * | | | Bluetooth: Remove hci_recv_stream_fragment functionMarcel Holtmann2015-04-071-3/+0
| * | | | Bluetooth: Make data pointer of hci_recv_stream_fragment constMarcel Holtmann2015-04-071-1/+1
| | |/ / | |/| |
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2015-04-092-1/+157
|\ \ \ \
| * \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextPablo Neira Ayuso2015-04-0818-93/+71
| |\ \ \ \
| * | | | | netfilter: nf_tables: support optional userdata for set elementsPatrick McHardy2015-04-081-0/+7
| * | | | | netfilter: nf_tables: add support for dynamic set updatesPatrick McHardy2015-04-082-0/+20
| * | | | | netfilter: nf_tables: support different set binding typesPatrick McHardy2015-04-081-0/+2
| * | | | | netfilter: nf_tables: prepare set element accounting for async updatesPatrick McHardy2015-04-081-1/+3
| * | | | | netfilter: nft_hash: add support for timeoutsPatrick McHardy2015-04-011-0/+5
| * | | | | netfilter: nf_tables: add GC synchronization helpersPatrick McHardy2015-04-011-0/+35
OpenPOWER on IntegriCloud