summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tun-timer-cleanups'David S. Miller2017-10-221-7/+8
|\
| * tun: do not arm flow_gc_timer in tun_flow_init()Eric Dumazet2017-10-221-2/+0
| * tun: avoid extra timer schedule in tun_flow_cleanup()Eric Dumazet2017-10-221-3/+6
| * tun: do not block BH again in tun_flow_cleanup()Eric Dumazet2017-10-221-2/+2
|/
* Merge branch 'bpf-BASE_RTT'David S. Miller2017-10-227-7/+213
|\
| * bpf: create samples/bpf/tcp_bpf.readmeLawrence Brakmo2017-10-221-0/+26
| * bpf: sample BPF_SOCKET_OPS_BASE_RTT programLawrence Brakmo2017-10-222-0/+79
| * bpf: Add BPF_SOCKET_OPS_BASE_RTT support to tcp_nvLawrence Brakmo2017-10-221-2/+38
| * bpf: Adding helper function bpf_getsockopsLawrence Brakmo2017-10-223-5/+63
| * bpf: add support for BPF_SOCK_OPS_BASE_RTTLawrence Brakmo2017-10-221-0/+7
|/
* nfp: use struct fields for 8 bit-wide accessPieter Jansen van Vuuren2017-10-222-74/+39
* net: x25: mark expected switch fall-throughsGustavo A. R. Silva2017-10-222-1/+2
* net: af_unix: mark expected switch fall-throughGustavo A. R. Silva2017-10-221-0/+1
* geneve: Get rid of is_all_zero(), streamline is_tnl_info_zero()Stefano Brivio2017-10-221-16/+3
* Merge branch 'dsa-lan9303-Add-fdb-mdb-methods'David S. Miller2017-10-222-0/+344
|\
| * net: dsa: lan9303: Add fdb/mdb manipulationEgil Hjelmeland2017-10-222-0/+182
| * net: dsa: lan9303: Add port_fast_age and port_fdb_dump methodsEgil Hjelmeland2017-10-222-0/+162
|/
* tipc: refactor tipc_sk_timeout() functionJon Maloy2017-10-221-26/+23
* Merge branch 'net-driver-refcont_t'David S. Miller2017-10-2220-96/+105
|\
| * drivers, connector: convert cn_callback_entry.refcnt from atomic_t to refcount_tElena Reshetova2017-10-223-5/+5
| * drivers, net, ppp: convert syncppp.refcnt from atomic_t to refcount_tElena Reshetova2017-10-221-5/+6
| * drivers, net, ppp: convert ppp_file.refcnt from atomic_t to refcount_tElena Reshetova2017-10-221-10/+11
| * drivers, net, ppp: convert asyncppp.refcnt from atomic_t to refcount_tElena Reshetova2017-10-221-5/+5
| * drivers, net: convert masces_tx_sa.refcnt from atomic_t to refcount_tElena Reshetova2017-10-221-4/+4
| * drivers, net: convert masces_rx_sc.refcnt from atomic_t to refcount_tElena Reshetova2017-10-221-4/+4
| * drivers, net: convert masces_rx_sa.refcnt from atomic_t to refcount_tElena Reshetova2017-10-221-4/+5
| * drivers, net, hamradio: convert sixpack.refcnt from atomic_t to refcount_tElena Reshetova2017-10-221-6/+6
| * drivers, net, mlx5: convert fs_node.refcount from atomic_t to refcount_tElena Reshetova2017-10-222-15/+16
| * drivers, net, mlx5: convert mlx5_cq.refcount from atomic_t to refcount_tElena Reshetova2017-10-222-10/+10
| * drivers, net, mlx4: convert mlx4_srq.refcount from atomic_t to refcount_tElena Reshetova2017-10-222-5/+5
| * drivers, net, mlx4: convert mlx4_qp.refcount from atomic_t to refcount_tElena Reshetova2017-10-222-5/+5
| * drivers, net, mlx4: convert mlx4_cq.refcount from atomic_t to refcount_tElena Reshetova2017-10-222-6/+6
| * drivers, net, ethernet: convert mtk_eth.dma_refcnt from atomic_t to refcount_tElena Reshetova2017-10-222-4/+8
| * drivers, net, ethernet: convert clip_entry.refcnt from atomic_t to refcount_tElena Reshetova2017-10-222-8/+9
|/
* Merge branch 'hns3-loopback-selftest'David S. Miller2017-10-224-5/+343
|\
| * net: hns3: Add mac loopback selftest support in hns3 driverYunsheng Lin2017-10-222-0/+327
| * net: hns3: Refactor the skb receiving and transmitting functionYunsheng Lin2017-10-222-5/+16
|/
* Merge branch 'bpftool-add-a-version-command-and-fix-several-items'David S. Miller2017-10-226-30/+56
|\
| * tools: bpftool: add a command to display bpftool versionQuentin Monnet2017-10-222-1/+15
| * tools: bpftool: show that `opcodes` or `file FILE` should be exclusiveQuentin Monnet2017-10-222-6/+6
| * tools: bpftool: print all relevant byte opcodes for "load double word"Quentin Monnet2017-10-221-3/+12
| * tools: bpftool: print only one error message on byte parsing failureQuentin Monnet2017-10-221-1/+1
| * tools: bpftool: add `bpftool prog help` as real command i.r.t exit codeQuentin Monnet2017-10-221-0/+1
| * tools: bpftool: use err() instead of info() if there are too many insnsQuentin Monnet2017-10-221-1/+1
| * tools: bpftool: fix return value when all eBPF programs have been shownQuentin Monnet2017-10-221-1/+3
| * tools: bpftool: add pointer to file argument to print_hex()Quentin Monnet2017-10-224-17/+17
|/
* net: sched: mark expected switch fall-throughsGustavo A. R. Silva2017-10-2210-0/+10
* net: rose: mark expected switch fall-throughsGustavo A. R. Silva2017-10-222-0/+3
* openvswitch: conntrack: mark expected switch fall-throughGustavo A. R. Silva2017-10-221-0/+1
* net: netrom: nr_in: mark expected switch fall-throughGustavo A. R. Silva2017-10-221-1/+1