summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* test_bpf: avoid oopsing the kernel when generate_test_data() fails.Nicolas Schichan2015-08-061-0/+5
* Merge branch 'mlx5e-next'David S. Miller2015-08-069-348/+675
|\
| * net/mlx5_core: Support physical port countersGal Pressman2015-08-065-1/+137
| * net/mlx5e: Take advantage of the light-weight netdev open/stopAchiad Shochat2015-08-063-106/+32
| * net/mlx5e: Disable async events before unregister_netdev()Achiad Shochat2015-08-061-2/+2
| * net/mlx5e: Rename/move functions following the ndo_stop flow changeAchiad Shochat2015-08-063-308/+306
| * net/mlx5e: Light-weight netdev open/stopAchiad Shochat2015-08-064-76/+184
| * net/mlx5_core: Introduce access function to modify RSS/LRO paramsAchiad Shochat2015-08-063-1/+22
| * net/mlx5e: Introduce the "Drop RQ"Achiad Shochat2015-08-062-11/+114
| * net/mlx5e: Unify the RX flowAchiad Shochat2015-08-062-34/+69
|/
* Merge branch 'cpsw-next'David S. Miller2015-08-061-48/+35
|\
| * drivers: net: cpsw: add separate napi for txMugunthan V N2015-08-061-13/+31
| * drivers: net: cpsw: dual_emac: simplify napi usageMugunthan V N2015-08-061-17/+9
| * drivers: net: cpsw: remove disable_irq/enable_irq as irq can be masked from c...Mugunthan V N2015-08-061-25/+2
|/
* mpls: small cleanup in inet/inet6_fib_lookup_dev()Dan Carpenter2015-08-061-9/+4
* Merge branch 'bnx2x-cnic-bnx2fc-bd-support'David S. Miller2015-08-067-7/+236
|\
| * bnx2fc: Read npiv table from nvram and create vports.Joe Carnuccio2015-08-061-0/+66
| * bnx2x: Add BD support for storageYuval Mintz2015-08-064-2/+118
| * cnic: Add the interfaces to get FC-NPIV table.Adheer Chandravanshi2015-08-062-2/+32
| * cnic: Populate upper layer driver state in MFWTej Parkash2015-08-062-3/+20
|/
* rocker: use netdev_err after register_netdevScott Feldman2015-08-061-1/+1
* rocker: NULL port if port probe failsScott Feldman2015-08-061-0/+1
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2015-08-0424-217/+461
|\
| * netfilter: ip6t_REJECT: Remove debug messages from reject_tg6()Subash Abhinov Kasiviswanathan2015-08-041-5/+0
| * netfilter: bridge: do not initialize statics to 0 or NULLBernhard Thaler2015-07-301-3/+3
| * netfilter: bridge: reduce nf_bridge_info to 32 bytes againFlorian Westphal2015-07-306-28/+33
| * netfilter: nf_ct_sctp: minimal multihoming supportMichal Kubeček2015-07-303-24/+81
| * netfilter: rename local nf_hook_list to hook_listPablo Neira Ayuso2015-07-232-21/+21
| * netfilter: fix possible removal of wrong hookPablo Neira Ayuso2015-07-231-22/+19
| * netfilter: nf_queue: fix nf_queue_nf_hook_drop()Pablo Neira Ayuso2015-07-233-11/+5
| * netfilter: Fix memory leak in nf_register_net_hookEric W. Biederman2015-07-201-1/+3
| * netfilter: xtables: remove __pure annotationFlorian Westphal2015-07-153-3/+3
| * netfilter: add and use jump label for xt_teeFlorian Westphal2015-07-155-2/+16
| * netfilter: xtables: don't save/restore jumpstack offsetFlorian Westphal2015-07-155-49/+48
| * netfilter: move tee_active to coreFlorian Westphal2015-07-153-7/+20
| * netfilter: xtables: compute exact size needed for jumpstackFlorian Westphal2015-07-154-25/+49
| * netfilter: nftables: Only run the nftables chains in the proper netnsEric W. Biederman2015-07-152-7/+6
| * netfilter: Per network namespace netfilter hooks.Eric W. Biederman2015-07-153-24/+173
| * netfilter: Factor out the hook list selection from nf_register_hookEric W. Biederman2015-07-151-14/+18
| * netfilter: Simply the tests for enabling and disabling the ingress queue hookEric W. Biederman2015-07-151-11/+6
| * netfilter: kill nf_hooks_activeEric W. Biederman2015-07-151-7/+4
| * ipvs: Delete an unnecessary check before the function call "module_put"Markus Elfring2015-07-151-1/+1
* | Merge branch 'cxgb4-next'David S. Miller2015-08-045-20/+506
|\ \
| * | cxgb4: Update T6 register rangesHariprasad Shenai2015-08-041-14/+12
| * | cxgb4/cxgb4vf: read the correct bits of PL Who Am I registerHariprasad Shenai2015-08-044-4/+45
| * | cxgb4: Add support to dump edc bist statusHariprasad Shenai2015-08-042-2/+42
| * | cxgb4: Add debugfs support to dump meminfoHariprasad Shenai2015-08-042-0/+407
|/ /
* | mpls: Use definition for reserved label checksRobert Shearman2015-08-032-10/+13
* | Merge branch 'lwtunnel-encap-local'David S. Miller2015-08-032-2/+12
|\ \
| * | ipv4: apply lwtunnel encap for locally-generated packetsRobert Shearman2015-08-031-0/+2
OpenPOWER on IntegriCloud