summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nfp-process-MTU-updates-from-firmware-flower-app'David S. Miller2017-08-164-5/+50
|\
| * nfp: process MTU updates from firmware flower appSimon Horman2017-08-161-2/+9
| * nfp: process control messages in workqueue in flower appSimon Horman2017-08-164-3/+41
|/
* bpf: devmap: remove unnecessary value size checkJohn Fastabend2017-08-161-6/+0
* Merge branch 'bpf-sockmap'David S. Miller2017-08-1629-59/+2316
|\
| * bpf: selftests add sockmap testsJohn Fastabend2017-08-167-39/+443
| * bpf: selftests: add tests for new __sk_buff membersJohn Fastabend2017-08-161-0/+152
| * bpf: sockmap sample programJohn Fastabend2017-08-168-6/+547
| * bpf: add access to sock fields and pkt data from sk_skb programsJohn Fastabend2017-08-163-0/+179
| * bpf: sockmap with sk redirect supportJohn Fastabend2017-08-169-5/+940
| * bpf: export bpf_prog_inc_not_zeroJohn Fastabend2017-08-162-1/+9
| * bpf: introduce new program type for skbs on socketsJohn Fastabend2017-08-163-0/+38
| * net: fixes for skb_send_sockJohn Fastabend2017-08-162-2/+2
| * net: add sendmsg_locked and sendpage_locked to af_inet6John Fastabend2017-08-161-0/+2
| * net: early init support for strparserJohn Fastabend2017-08-161-6/+4
|/
* net: 3c509: constify pnp_device_idArvind Yadav2017-08-161-1/+1
* liquidio: update VF's netdev->max_mtu if there's a change in PF's MTUVeerasenareddy Burru2017-08-162-6/+6
* Merge branch 'net-sizeof-cleanups'David S. Miller2017-08-1619-60/+60
|\
| * mlx4: sizeof style usagestephen hemminger2017-08-1615-56/+56
| * skge: add paren around sizeof argstephen hemminger2017-08-161-1/+1
| * virtio: put paren around sizeofstephen hemminger2017-08-161-1/+1
| * tun/tap: use paren's with sizeofstephen hemminger2017-08-162-2/+2
|/
* net_sched/hfsc: opencode trivial set_active() and set_passive()Konstantin Khlebnikov2017-08-161-29/+16
* net_sched: call qlen_notify only if child qdisc is emptyKonstantin Khlebnikov2017-08-166-13/+15
* Merge branch 'liquidio-adding-support-for-ethtool-set-channels-feature'David S. Miller2017-08-157-451/+529
|\
| * liquidio: added support for ethtool --set-channels featureIntiyaz Basha2017-08-156-50/+226
| * liquidio: moved octeon_setup_interrupt to lio_core.cIntiyaz Basha2017-08-154-263/+202
| * liquidio: moved liquidio_legacy_intr_handler to lio_core.cIntiyaz Basha2017-08-153-56/+57
| * liquidio: moved liquidio_msix_intr_handler to lio_core.cIntiyaz Basha2017-08-155-88/+50
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-08-15228-904/+2154
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2017-08-1558-159/+512
| |\
| | * bpf: fix bpf_trace_printk on 32 bit archsDaniel Borkmann2017-08-151-4/+30
| | * PCI: fix oops when try to find Root Port for a PCI devicedingtianhong2017-08-151-3/+4
| | * sfc: don't try and read ef10 data on non-ef10 NICBert Kenward2017-08-151-2/+6
| | * net_sched: remove warning from qdisc_hash_addKonstantin Khlebnikov2017-08-151-3/+0
| | * net_sched/sfq: update hierarchical backlog when drop packetKonstantin Khlebnikov2017-08-151-1/+4
| | * net_sched: reset pointers to tcf blocks in classful qdiscs' destructorsKonstantin Khlebnikov2017-08-154-4/+12
| | * ipv4: fix NULL dereference in free_fib_info_rcu()Eric Dumazet2017-08-151-5/+7
| | * net: Fix a typo in comment about sock flags.Tonghao Zhang2017-08-151-1/+1
| | * ipv6: fix NULL dereference in ip6_route_dev_notify()Eric Dumazet2017-08-152-3/+13
| | * Merge tag 'wireless-drivers-for-davem-2017-08-15' of git://git.kernel.org/pub...David S. Miller2017-08-1515-40/+126
| | |\
| | | * brcmfmac: feature check for multi-scheduled scan fails on bcm4343x devicesArend Van Spriel2017-08-141-2/+4
| | | * Merge tag 'iwlwifi-for-kalle-2018-08-09' of git://git.kernel.org/pub/scm/linu...Kalle Valo2017-08-096-10/+59
| | | |\
| | | | * iwlwifi: mvm: send delba upon rx ba session timeoutNaftali Goldstein2017-08-091-2/+2
| | | | * mac80211: add api to start ba session timer expired flowNaftali Goldstein2017-08-092-1/+36
| | | | * iwlwifi: mvm: don't WARN when a legit race happens in A-MPDUEmmanuel Grumbach2017-08-091-4/+6
| | | | * iwlwifi: mvm: start mac queues when deferred tx frames are purgedAvraham Stern2017-08-091-1/+11
| | | | * iwlwifi: mvm: Fix a memory leak in an error handling path in 'iwl_mvm_sar_get...Christophe Jaillet2017-08-051-2/+4
| | | |/
| | | * Merge tag 'iwlwifi-for-kalle-2017-08-02' of git://git.kernel.org/pub/scm/linu...Kalle Valo2017-08-039-28/+63
| | | |\
| | | | * iwlwifi: add the new 9000 series PCI IDsTzipi Peres2017-08-011-0/+20