summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* tun: reserve extra headroom only when XDP is setJason Wang2017-09-051-8/+18
* Merge branch 'dsa-tx-queues'David S. Miller2017-09-055-4/+27
|\
| * net: dsa: bcm_sf2: Configure IMP port TC2QOS mappingFlorian Fainelli2017-09-051-0/+9
| * net: dsa: bcm_sf2: Advertise number of egress queuesFlorian Fainelli2017-09-052-1/+7
| * net: dsa: tag_brcm: Set output queue from skb queue mappingFlorian Fainelli2017-09-051-1/+2
| * net: dsa: Allow switch drivers to indicate number of TX queuesFlorian Fainelli2017-09-052-2/+9
|/
* bridge: switchdev: Use an helper to clear forward markIdo Schimmel2017-09-052-3/+10
* net/mlx4_core: Use ARRAY_SIZE macroThomas Meyer2017-09-052-6/+8
* Merge branch 'flow_dissector-fixes'David S. Miller2017-09-052-78/+172
|\
| * flow_dissector: Add limit for number of headers to dissectTom Herbert2017-09-051-3/+22
| * flow_dissector: Cleanup control flowTom Herbert2017-09-052-78/+153
|/
* soc: ti/knav_dma: include dmaengine headerArnd Bergmann2017-09-051-0/+2
* net/ncsi: fix ncsi_vlan_rx_{add,kill}_vid referencesArnd Bergmann2017-09-052-0/+12
* bpf: fix numa_node validationEric Dumazet2017-09-051-1/+2
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2017-09-0440-352/+788
|\
| * netfilter: nf_tables: support for recursive chain deletionPablo Neira Ayuso2017-09-041-1/+23
| * netfilter: nf_tables: use NLM_F_NONREC for deletion requestsPablo Neira Ayuso2017-09-041-1/+7
| * netlink: add NLM_F_NONREC flag for deletion requestsPablo Neira Ayuso2017-09-041-0/+3
| * netfilter: nf_tables: add nf_tables_addchain()Pablo Neira Ayuso2017-09-041-93/+106
| * netfilter: nf_tables: add nf_tables_updchain()Pablo Neira Ayuso2017-09-041-78/+92
| * net: Remove CONFIG_NETFILTER_DEBUG and _ASSERT() macros.Varsha Rao2017-09-047-45/+14
| * net: Replace NF_CT_ASSERT() with WARN_ON().Varsha Rao2017-09-0415-46/+45
| * netfilter: remove unused hooknum arg from packet functionsFlorian Westphal2017-09-0410-13/+4
| * netfilter: nft_limit: add stateful object typePablo M. Bermudo Garay2017-09-042-2/+123
| * netfilter: nft_limit: replace pkt_bytes with bytesPablo M. Bermudo Garay2017-09-041-13/+13
| * netfilter: nf_tables: add select_ops for stateful objectsPablo M. Bermudo Garay2017-09-046-46/+90
| * netfilter: xt_hashlimit: add rate match modeVishwanath Pai2017-09-043-31/+285
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2017-09-037-11/+24
|\ \
| * | Bluetooth: make baswap src constLoic Poulain2017-09-012-4/+4
| * | Bluetooth: Add option for disabling legacy ioctl interfacesMarcel Holtmann2017-08-302-0/+16
| * | ieee802154: 6lowpan: make header_ops constBhumika Goyal2017-08-251-1/+1
| * | ieee802154: ca8210: Fix a potential NULL pointer dereferenceChristophe JAILLET2017-08-201-4/+1
| * | Bluetooth: make device_type constBhumika Goyal2017-08-191-2/+2
* | | Merge branch 'qualcomm-rmnet-Fix-comments-on-initial-patchset'David S. Miller2017-09-039-181/+119
|\ \ \ | |_|/ |/| |
| * | net: qualcomm: rmnet: Rename real_dev_info to portSubash Abhinov Kasiviswanathan2017-09-038-87/+82
| * | net: qualcomm: rmnet: Implement ndo_get_iflinkSubash Abhinov Kasiviswanathan2017-09-034-3/+15
| * | net: qualcomm: rmnet: Refactor the new rmnet dev creationSubash Abhinov Kasiviswanathan2017-09-033-84/+26
| * | net: qualcomm: rmnet: Move the device creation logSubash Abhinov Kasiviswanathan2017-09-031-2/+1
| * | net: qualcomm: rmnet: Remove the unused endpoint -1Subash Abhinov Kasiviswanathan2017-09-031-11/+3
| * | net: qualcomm: rmnet: Fix memory corruption if mux_id is greater than 32Subash Abhinov Kasiviswanathan2017-09-033-4/+2
|/ /
* | Merge branch 'nfp-refactor-app-init-and-minor-flower-fixes'David S. Miller2017-09-0311-68/+136
|\ \
| * | nfp: flower: restore RTNL locking around representor updatesJakub Kicinski2017-09-031-2/+4
| * | nfp: build the flower offload by defaultJakub Kicinski2017-09-031-0/+1
| * | nfp: be drop monitor friendlyJakub Kicinski2017-09-032-1/+4
| * | nfp: move the start/stop app callbacks backJakub Kicinski2017-09-031-15/+11
| * | nfp: flower: base lifetime of representors on existence of lower vNICJakub Kicinski2017-09-031-23/+43
| * | nfp: separate app vNIC init/clean from alloc/freeJakub Kicinski2017-09-039-27/+73
|/ /
* | Merge tag 'mlx5-updates-2017-09-03' of git://git.kernel.org/pub/scm/linux/ker...David S. Miller2017-09-038-228/+216
|\ \
| * | net/mlx5e: Distribute RSS table among all RX ringsTariq Toukan2017-09-033-17/+4
| * | net/mlx5e: Stop NAPI when irq balancer changes affinityTariq Toukan2017-09-033-2/+26