summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-08-176-26/+47
|\
| * net_sched: convert tcf_exts from list to pointer arrayWANG Cong2016-08-172-16/+28
| * net_sched: move tc offload macros to pkt_cls.hWANG Cong2016-08-172-16/+22
| * net_sched: fix a typo in tc_for_each_action()WANG Cong2016-08-171-1/+1
| * gre: set inner_protocol on xmitSimon Horman2016-08-151-0/+1
| * ipv6: suppress sparse warnings in IP6_ECN_set_ce()Johannes Berg2016-08-131-1/+2
| * Merge tag 'mac80211-for-davem-2016-08-05' of git://git.kernel.org/pub/scm/lin...David S. Miller2016-08-061-1/+2
| |\
| | * mac80211: Add ieee80211_hw pointer to get_expected_throughputMaxim Altshul2016-08-051-1/+2
| * | rxrpc: Fix races between skb free, ACK generation and replyingDavid Howells2016-08-061-1/+1
* | | Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostLinus Torvalds2016-08-061-0/+6
|\ \ \ | |/ / |/| |
| * | VSOCK: Introduce virtio_vsock_common.koAsias He2016-08-021-0/+2
| * | VSOCK: defer sock removal to transportsStefan Hajnoczi2016-08-021-0/+1
| * | VSOCK: transport-specific vsock_transport functionsStefan Hajnoczi2016-08-021-0/+3
* | | 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-294-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-2513-45/+42
* | | | net_sched: move tc_action into tcf_commonWANG Cong2016-07-2513-50/+42
* | | | mlxsw: spectrum: Fix compilation error when CLS_ACT isn't setIdo Schimmel2016-07-251-0/+4
* | | | gtp: #define #define _GTP_H_ and not #define _GTP_HColin Ian King2016-07-251-1/+1
* | | | net/sched: act_mirred: Add helper inlines to access tcf_mirred info.Yotam Gigi2016-07-241-0/+9
* | | | net/sched: Add match-all classifier hw offloading.Yotam Gigi2016-07-241-0/+11
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2016-07-247-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
|\ \ \ \ \ | | |_|_|/ | |/| | |