summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* test_bpf: add bpf_skb_vlan_push/pop() testsAlexei Starovoitov2015-07-203-3/+98
* bpf: introduce bpf_skb_vlan_push/pop() helpersAlexei Starovoitov2015-07-206-38/+99
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2015-07-2015-180/+134
|\
| * igb: Fix i354 88E1112 PHY on RCC boards using AutoMediaDetectTodd Fujinaka2015-07-171-5/+13
| * ixgbe: Don't report flow director filter's statusFan Du2015-07-171-2/+0
| * ixgbevf: Set Rx hash type for ingress packetsFan Du2015-07-172-0/+39
| * ixgbe: Specify Rx hash type WRT Rx desc RSS typeFan Du2015-07-171-4/+21
| * ixgbevf: fold ixgbevf_pull_tail into ixgbevf_add_rx_fragAlexander Duyck2015-07-171-47/+19
| * igb: Pull timestamp from fragment before adding it to skbAlexander Duyck2015-07-171-69/+25
| * dp83640: only report generic filters in ts_infoJacob Keller2015-07-171-9/+1
| * siena: only report generic filters in get_ts_infoJacob Keller2015-07-171-5/+1
| * ixgbe: only report generic filters in get_ts_infoJacob Keller2015-07-171-8/+0
| * igb: only report generic filters in get_ts_infoJacob Keller2015-07-171-4/+0
| * i40e: only report generic filters in get_ts_infoJacob Keller2015-07-171-11/+2
| * bnx2x: only report most generic filters in get_ts_infoJacob Keller2015-07-171-10/+1
| * freescale: remove incorrect copied commentJacob Keller2015-07-171-6/+0
| * clarify implementation of ethtool's get_ts_info opJacob Keller2015-07-172-0/+12
* | Merge branch 'bcmgenet-phy-rework'David S. Miller2015-07-203-63/+59
|\ \
| * | net: bcmgenet: Remove init parameter from bcmgenet_mii_configFlorian Fainelli2015-07-203-6/+5
| * | net: bcmgenet: Delay PHY initialization to bcmgenet_open()Florian Fainelli2015-07-203-30/+20
| * | net: bcmgenet: Determine PHY type before scanning MDIO busFlorian Fainelli2015-07-203-12/+32
| * | net: bcmgenet: Power on integrated GPHY in bcmgenet_power_up()Florian Fainelli2015-07-201-0/+2
| * | net: bcmgenet: Use correct dev_id for free_irqFlorian Fainelli2015-07-201-1/+1
| * | net: bcmgenet: Remove excessive PHY resetFlorian Fainelli2015-07-203-15/+0
|/ /
* | Merge branch 'stmmac-cleanup'David S. Miller2015-07-206-114/+126
|\ \
| * | stmmac: drop custom_* fields from plat_stmmacenet_dataJoachim Eastwood2015-07-202-6/+0
| * | stmmac: add proper probe function to dwmac-mesonJoachim Eastwood2015-07-201-11/+20
| * | stmmac: add proper probe function to dwmac-lpc18xxJoachim Eastwood2015-07-201-36/+23
| * | stmmac: export probe_config_dt() and get_platform_resources()Joachim Eastwood2015-07-202-4/+14
| * | stmmac: make stmmac_probe_config_dt return the platform data structJoachim Eastwood2015-07-201-16/+12
| * | stmmac: introduce stmmac_get_platform_resources()Joachim Eastwood2015-07-201-27/+37
| * | stmmac: clean up platform/of_match data retrievalJoachim Eastwood2015-07-201-21/+29
| * | stmmac: use of_device_get_match_data to retrieve of match dataJoachim Eastwood2015-07-201-5/+3
|/ /
* | Merge branch 'tipc-separate-link-and-aggregation'David S. Miller2015-07-2013-1018/+1431
|\ \
| * | tipc: reduce locking scope during packet receptionJon Paul Maloy2015-07-208-389/+478
| * | tipc: introduce node contact FSMJon Paul Maloy2015-07-204-54/+185
| * | tipc: move link supervision timer to node levelJon Paul Maloy2015-07-204-80/+68
| * | tipc: simplify link timer implementationJon Paul Maloy2015-07-202-45/+72
| * | tipc: improve link FSM implementationJon Paul Maloy2015-07-202-156/+195
| * | tipc: introduce new link protocol msg create functionJon Paul Maloy2015-07-201-67/+77
| * | tipc: clean up definitions and usage of link flagsJon Paul Maloy2015-07-204-78/+67
| * | tipc: make media xmit call outside node spinlock contextJon Paul Maloy2015-07-208-77/+198
| * | tipc: change sk_buffer handling in tipc_link_xmit()Jon Paul Maloy2015-07-203-40/+37
| * | tipc: use bearer index when looking up active linksJon Paul Maloy2015-07-202-73/+59
| * | tipc: move link input queue to tipc_nodeJon Paul Maloy2015-07-204-19/+27
| * | tipc: move link creation from neighbor discoverer to nodeJon Paul Maloy2015-07-203-16/+37
| * | tipc: introduce link entry structure to struct tipc_nodeJon Paul Maloy2015-07-206-136/+143
|/ /
* | net: remove skb_frag_add_headJiri Benc2015-07-201-6/+0
* | Merge branch 'offload_fwd_mark'David S. Miller2015-07-208-9/+169
|\ \
| * | switchdev: update documentation for offload_fwd_markScott Feldman2015-07-201-2/+12
OpenPOWER on IntegriCloud