summaryrefslogtreecommitdiffstats
path: root/include/net (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-08-031-1/+1
|\
| * sctp: change to use TCP_CLOSE_WAIT as SCTP_SS_CLOSINGXin Long2016-08-011-1/+1
* | treewide: replace obsolete _refok by __refFabian Frederick2016-08-021-1/+1
|/
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2016-07-304-5/+204
|\
| * Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux in...James Morris2016-07-074-5/+204
| |\
| | * netlabel: Implement CALIPSO config functions for SMACK.Huw Davies2016-06-271-0/+26
| | * calipso: Add a label cache.Huw Davies2016-06-272-2/+13
| | * calipso: Add validation of CALIPSO option.Huw Davies2016-06-271-0/+6
| | * netlabel: Pass a family parameter to netlbl_skbuff_err().Huw Davies2016-06-271-1/+1
| | * calipso: Allow the lsm to label the skbuff directly.Huw Davies2016-06-271-0/+11
| | * ipv6: constify the skb pointer of ipv6_find_tlv().Huw Davies2016-06-271-1/+1
| | * calipso: Allow request sockets to be relabelled by the lsm.Huw Davies2016-06-271-0/+6
| | * ipv6: Allow request socks to contain IPv6 options.Huw Davies2016-06-271-1/+6
| | * calipso: Set the calipso socket label to match the secattr.Huw Davies2016-06-272-0/+11
| | * netlabel: Move bitmap manipulation functions to the NetLabel core.Huw Davies2016-06-271-0/+6
| | * ipv6: Add ipv6_renew_options_kern() that accepts a kernel mem pointer.Huw Davies2016-06-271-0/+6
| | * netlabel: Add support for removing a CALIPSO DOI.Huw Davies2016-06-271-0/+1
| | * netlabel: Add support for enumerating the CALIPSO DOI list.Huw Davies2016-06-271-0/+4
| | * netlabel: Add support for querying a CALIPSO DOI.Huw Davies2016-06-271-0/+4
| | * netlabel: Initial support for the CALIPSO netlink protocol.Huw Davies2016-06-272-0/+102
* | | net_sched: get rid of struct tcf_commonWANG Cong2016-07-2613-45/+42
* | | net_sched: move tc_action into tcf_commonWANG Cong2016-07-2613-50/+42
* | | mlxsw: spectrum: Fix compilation error when CLS_ACT isn't setIdo Schimmel2016-07-261-0/+4
* | | gtp: #define #define _GTP_H_ and not #define _GTP_HColin Ian King2016-07-261-1/+1
* | | net/sched: act_mirred: Add helper inlines to access tcf_mirred info.Yotam Gigi2016-07-251-0/+9
* | | net/sched: Add match-all classifier hw offloading.Yotam Gigi2016-07-251-0/+11
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2016-07-257-31/+40
|\ \ \
| * | | netfilter: connlabels: move set helper to xt_connlabelFlorian Westphal2016-07-221-2/+0
| * | | netfilter: conntrack: support a fixed size of 128 distinct labelsFlorian Westphal2016-07-221-12/+4
| * | | netfilter: Add helper array register/unregister functionsGao Feng2016-07-211-0/+15
| * | | netfilter: nf_tables: get rid of possible_net_t from set and basechainPablo Neira Ayuso2016-07-111-10/+11
| * | | netfilter: constify arg to is_dying/confirmedFlorian Westphal2016-07-111-2/+2
| * | | netfilter: nat: convert nat bysrc hash to rhashtableFlorian Westphal2016-07-112-1/+3
| * | | netfilter: move nat hlist_head to nf_connFlorian Westphal2016-07-113-5/+3
| * | | netfilter: conntrack: simplify early_dropFlorian Westphal2016-07-111-0/+1
| * | | netfilter: conntrack: fix race between nf_conntrack proc read and hash resizeLiping Zhang2016-07-111-0/+2
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-07-243-2/+16
|\ \ \ \
| * | | | net: switchdev: change ageing_time type to clock_tVivien Didelot2016-07-201-1/+1
| * | | | dccp: limit sk_filter trim to payloadWillem de Bruijn2016-07-131-1/+7
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2016-07-121-0/+8
| |\ \ \ \
| | * | | | netfilter: nft_ct: fix expiration getterFlorian Westphal2016-07-081-0/+8
* | | | | | gro_cells: gro_cells_receive now return error codePaolo Abeni2016-07-221-6/+5
* | | | | | Merge tag 'nfc-next-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s...David S. Miller2016-07-212-6/+2
|\ \ \ \ \ \
| * | | | | | NFC: digital: Add support for NFC DEP Response Waiting TimeThierry Escande2016-07-111-0/+1
| * | | | | | NFC: digital: Fix handling of saved PDU sk_buff pointersThierry Escande2016-07-111-1/+0
| * | | | | | NFC: digital: Add a delay between poll cyclesThierry Escande2016-07-041-1/+1
| * | | | | | NFC: hci: delete unused nfc_llc_get_rx_head_tail_room()Denys Vlasenko2016-07-041-4/+0
* | | | | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2016-07-201-3/+6
|\ \ \ \ \ \ \
| * | | | | | | Bluetooth: Add debugfs fields for hardware and firmware infoMarcel Holtmann2016-07-181-0/+4
| * | | | | | | Bluetooth: Move hci_recv_frame and hci_recv_diag prototypesMarcel Holtmann2016-07-181-3/+2