summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* sctp: remove the typedef sctp_init_chunk_tXin Long2017-07-017-27/+27
* sctp: remove the typedef sctp_inithdr_tXin Long2017-07-014-13/+13
* sctp: remove the typedef sctp_data_chunk_tXin Long2017-07-016-10/+10
* sctp: remove the typedef sctp_datahdr_tXin Long2017-07-012-8/+11
* sctp: remove the typedef sctp_param_action_tXin Long2017-07-011-2/+2
* sctp: remove the typedef sctp_param_tXin Long2017-07-013-11/+9
* sctp: remove the typedef sctp_paramhdr_tXin Long2017-07-0110-71/+79
* sctp: remove the typedef sctp_cid_action_tXin Long2017-07-011-2/+2
* sctp: remove the typedef sctp_cid_tXin Long2017-07-017-14/+16
* sctp: remove the typedef sctp_chunkhdr_tXin Long2017-07-0112-103/+102
* sctp: remove the typedef sctp_sctphdr_tXin Long2017-07-017-25/+24
* Merge branch 'nfp-introduce-flower-offload-capabilities'David S. Miller2017-07-0115-29/+1816
|\
| * nfp: add control message passing capabilities to flower offloadsPieter Jansen van Vuuren2017-07-013-1/+70
| * nfp: add a stats handler for flower offloadsPieter Jansen van Vuuren2017-07-015-8/+171
| * nfp: add metadata to each flow offloadPieter Jansen van Vuuren2017-07-015-13/+412
| * nfp: add basic action capabilities to flower offloadsPieter Jansen van Vuuren2017-07-015-0/+271
| * nfp: extend flower matching capabilitiesPieter Jansen van Vuuren2017-07-016-1/+316
| * nfp: extend flower add flow offloadPieter Jansen van Vuuren2017-07-013-1/+325
| * nfp: provide infrastructure for offloading flower based TC filtersPieter Jansen van Vuuren2017-07-018-14/+220
| * nfp: add phys_switch_id supportSimon Horman2017-07-014-0/+36
| * net: switchdev: add SET_SWITCHDEV_OPS helperSimon Horman2017-07-011-0/+4
|/
* sctp: remove an unnecessary check from sctp_endpoint_destroyXin Long2017-07-011-8/+6
* Merge branch 'net-refcount_t'David S. Miller2017-07-01105-322/+321
|\
| * net: convert packet_fanout.sk_ref from atomic_t to refcount_tReshetova, Elena2017-07-012-5/+7
| * net: convert netlbl_lsm_cache.refcount from atomic_t to refcount_tReshetova, Elena2017-07-013-8/+8
| * net: convert net.passive from atomic_t to refcount_tReshetova, Elena2017-07-013-4/+5
| * net: convert inet_frag_queue.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-013-10/+10
| * net: convert fib_rule.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-012-5/+6
| * net: convert unix_address.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-012-5/+6
| * net: convert netpoll_info.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-012-4/+5
| * net: convert in_device.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-012-6/+7
| * net: convert ip_mc_list.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-012-6/+7
| * net: convert sock.sk_refcnt from atomic_t to refcount_tReshetova, Elena2017-07-0135-69/+70
| * net: convert sock.sk_wmem_alloc from atomic_t to refcount_tReshetova, Elena2017-07-0137-85/+74
| * net: convert sk_buff_fclones.fclone_ref from atomic_t to refcount_tReshetova, Elena2017-07-012-7/+7
| * net: convert sk_buff.users from atomic_t to refcount_tReshetova, Elena2017-07-0121-67/+67
| * net: convert nf_bridge_info.use from atomic_t to refcount_tReshetova, Elena2017-07-013-6/+6
| * net: convert neigh_params.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-012-7/+7
| * net: convert neighbour.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-016-17/+18
| * net: convert inet_peer.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-012-11/+11
|/
* Merge branch 'PTP-support-for-macb-driver'David S. Miller2017-06-306-41/+854
|\
| * net: macb: Add hardware PTP supportRafal Ozieblo2017-06-304-6/+732
| * net: macb: macb.c changed to macb_main.cRafal Ozieblo2017-06-302-0/+1
| * net: macb: Add tsu_clk to device treeRafal Ozieblo2017-06-301-0/+1
| * net: macb: Add support for PTP timestamps in DMA descriptorsRafal Ozieblo2017-06-303-37/+122
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-06-30200-881/+1392
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2017-06-2942-84/+350
| |\
| | * sfc: fix attempt to translate invalid filter IDEdward Cree2017-06-291-3/+4
| | * net: handle NAPI_GRO_FREE_STOLEN_HEAD case also in napi_frags_finish()Michal Kubeček2017-06-291-7/+17
| | * bpf: prevent leaking pointer via xadd on unpriviledgedDaniel Borkmann2017-06-292-0/+71