summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'iff_no_queue_fixups'David S. Miller2015-08-284-32/+26
|\
| * net: sched: simplify attach_one_default_qdisc()Phil Sutter2015-08-281-29/+12
| * net: sched: register noqueue qdiscPhil Sutter2015-08-283-1/+13
| * net: sched: ignore tx_queue_len when assigning default qdiscPhil Sutter2015-08-281-2/+1
| * net: fix IFF_NO_QUEUE for drivers using alloc_netdevPhil Sutter2015-08-281-1/+1
|/
* sock: fix kernel doc errorJean Sacren2015-08-281-1/+1
* net/mlx4_core: Fix unintialized variable used in error pathCarol L Soto2015-08-281-3/+2
* net/mlx4_core: Capping number of requested MSIXs to MAX_MSIXCarol L Soto2015-08-281-1/+9
* bridge: fdb: rearrange net_bridge_fdb_entryNikolay Aleksandrov2015-08-281-2/+2
* Merge branch 'ovs-v6-build-err'David S. Miller2015-08-282-9/+10
|\
| * openvswitch: Include ip6_fib.h.Joe Stringer2015-08-281-0/+1
| * netfilter: Define v6ops in !CONFIG_NETFILTER case.Joe Stringer2015-08-281-9/+9
|/
* Merge branch 'mlxsw-small-updates'David S. Miller2015-08-282-36/+52
|\
| * mlxsw: Make mailboxes 4KB alignedIdo Schimmel2015-08-281-33/+50
| * mlxsw: adjust transmit fail log message level in __mlxsw_emad_transmitJiri Pirko2015-08-281-2/+2
| * mlxsw: Remove duplicate included headerIdo Schimmel2015-08-281-1/+0
|/
* Merge branch 'rocker-master-change'David S. Miller2015-08-284-70/+97
|\
| * rocker: use change upper infoJiri Pirko2015-08-281-23/+38
| * rocker: use new helper to figure out master kindJiri Pirko2015-08-281-12/+7
| * net: kill long time unused bonding private flagsJiri Pirko2015-08-281-36/+21
| * net: add netif_is_ovs_master helper with IFF_OPENVSWITCH private flagJiri Pirko2015-08-282-1/+9
| * net: add netif_is_bridge_master helperJiri Pirko2015-08-281-0/+5
| * net: introduce change upper device notifier change infoJiri Pirko2015-08-282-2/+21
|/
* virtio-net: avoid unnecessary sg initialzationJason Wang2015-08-281-2/+2
* Merge branch 'geneve-consolidation'David S. Miller2015-08-2814-793/+767
|\
| * geneve: Move device hash table to geneve socket.Pravin B Shelar2015-08-281-26/+17
| * geneve: Consolidate Geneve functionality in single module.Pravin B Shelar2015-08-286-586/+421
| * openvswitch: Use Geneve device.Pravin B Shelar2015-08-282-148/+33
| * geneve: Add support to collect tunnel metadata.Pravin B Shelar2015-08-283-85/+275
| * geneve: Make dst-port configurable.Pravin B Shelar2015-08-282-4/+22
| * tunnel: introduce udp_tun_rx_dst()Pravin B Shelar2015-08-285-43/+97
| * geneve: Use skb mark and protocol to lookup route.Pravin B Shelar2015-08-281-0/+3
| * geneve: Initialize ethernet address in device setup.Pravin B Shelar2015-08-281-3/+1
|/
* bridge: Add netlink support for vlan_protocol attributeToshiaki Makita2015-08-284-14/+57
* bnx2x: Add new device ids under the Qlogic vendorYuval Mintz2015-08-281-0/+3
* smsc911x: Ignore error return from device_get_phy_mode()Guenter Roeck2015-08-271-6/+8
* device property: Return -ENXIO if there is no suitable FW interfaceGuenter Roeck2015-08-271-4/+13
* net: sched: consolidate tc_classify{,_compat}Daniel Borkmann2015-08-2716-47/+40
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2015-08-2715-3166/+188
|\
| * i40e/i40evf: Bump i40e to 1.3.9 and i40evf to 1.3.5Catherine Sullivan2015-08-272-3/+3
| * i40e/i40evf: Cache the CEE TLV status returned from firmwareNeerav Parikh2015-08-273-0/+6
| * i40e/i40evf: add VIRTCHNL_VF_OFFLOAD flagAnjali Singhai Jain2015-08-274-0/+21
| * i40e: Remove redundant and unneeded messagesGreg Rose2015-08-272-4/+0
| * i40evf: Remove PF specific register definitions from the VFAnjali Singhai Jain2015-08-273-3108/+4
| * i40evf: Use the correct defines to match the VF registersAnjali Singhai Jain2015-08-272-33/+33
| * i40e: correct spelling errorMitch Williams2015-08-271-1/+1
| * i40e: Fix comment for ethtool diagnostic link testGreg Rose2015-08-261-3/+5
| * i40e/i40evf: Add capability to gather VEB per TC statsNeerav Parikh2015-08-265-2/+67
| * i40e: Fix ethtool offline diagnostic with netqueuesGreg Rose2015-08-261-2/+17
| * i40e: Fix legacy interrupt mode in the driverAnjali Singhai Jain2015-08-261-4/+12