summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net: sched: avoid duplicates in qdisc dumpJiri Kosina2016-08-191-4/+10
* net: sched: fix handling of singleton qdiscs with qdisc_hashJiri Kosina2016-08-191-0/+10
* Merge branch 'tipc-next'David S. Miller2016-08-194-47/+52
|\
| * tipc: ensure that link congestion and wakeup use same criteriaJon Paul Maloy2016-08-191-8/+10
| * tipc: make bearer packet filtering genericJon Paul Maloy2016-08-193-39/+42
|/
* Merge branch 'qed-next'David S. Miller2016-08-199-18/+190
|\
| * qed: Add support for NCSI statistics.Sudarsana Reddy Kalluru2016-08-196-5/+127
| * qede: Add support for per-queue stats.Sudarsana Reddy Kalluru2016-08-193-13/+57
| * qede: Add support for capturing additional stats in ethtool-stats display.Sudarsana Reddy Kalluru2016-08-193-0/+6
|/
* net: atm: remove redundant null pointer check on dev->nameColin Ian King2016-08-191-1/+1
* net: phy: Update copyright infoAppana Durga Kedareswara Rao2016-08-191-0/+2
* net: ethernet: macb: Add support for rx_clkshubhrajyoti.datta@xilinx.com2016-08-193-6/+30
* Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe...David S. Miller2016-08-196-92/+201
|\
| * i40e: Expose 'trust' flag to userspace via ndo_get_vf_config.Sridhar Samudrala2016-08-181-0/+1
| * i40e: remove a stray unlockDan Carpenter2016-08-181-1/+0
| * i40e/i40evf-Bump version from 1.6.11 to 1.6.12Bimmy Pujari2016-08-182-2/+2
| * i40e: Allow RSS Hash set with less than four parametersCarolyn Wyborny2016-08-182-81/+130
| * i40e: fix memory leakMitch Williams2016-08-181-0/+1
| * i40e: fix lookup table when RSS disabled/enabledAlan Brady2016-08-181-0/+28
| * i40e: Don't notify client of VF reset during VF creationAvinash Dayanand2016-08-181-2/+5
| * i40e: Force register writes to mitigate sync issues with iwarp VF driverAvinash Dayanand2016-08-181-1/+2
| * i40e: don't allow reduction of channels below active FD rulesJacob Keller2016-08-181-0/+24
| * i40e: Fix static analysis tool warningDave Ertman2016-08-181-3/+1
| * i40evf: add missing rtnl_lock() around i40evf_set_interrupt_capabilityJacob Keller2016-08-181-0/+2
| * i40e: reset RX csum error stat with other pf statsCatherine Sullivan2016-08-181-0/+1
| * i40e/i40evf: Reset VLAN filter count when resettingCatherine Sullivan2016-08-181-0/+1
| * i40e: Fix a bug where a client close can be called before an open is completeAnjali Singhai Jain2016-08-181-0/+2
| * i40e: Use list_move instead of list_del/list_addWei Yongjun2016-08-181-2/+1
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-08-181746-76931/+55863
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-08-18116-1109/+1486
| |\
| | * Merge branch 'tc_action-fixes'David S. Miller2016-08-188-119/+112
| | |\
| | | * net_sched: allow flushing tc police actionsRoman Mashak2016-08-181-42/+1
| | | * net_sched: unify the init logic for act_policeWANG Cong2016-08-181-9/+10
| | | * net_sched: convert tcf_exts from list to pointer arrayWANG Cong2016-08-187-41/+85
| | | * net_sched: move tc offload macros to pkt_cls.hWANG Cong2016-08-182-16/+22
| | | * net_sched: fix a typo in tc_for_each_action()WANG Cong2016-08-181-1/+1
| | | * net_sched: remove an unnecessary list_del()WANG Cong2016-08-181-1/+0
| | | * net_sched: remove the leftover cleanup_a()WANG Cong2016-08-181-19/+3
| | |/
| | * Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher...David S. Miller2016-08-187-49/+107
| | |\
| | | * i40e: check for and deal with non-contiguous TCsDave Ertman2016-08-161-10/+25
| | | * ixgbe: Re-enable ability to toggle VLAN filteringAlexander Duyck2016-08-161-0/+1
| | | * ixgbe: Force VLNCTRL.VFE to be set in all VMDq pathsAlexander Duyck2016-08-161-6/+12
| | | * e1000e: fix PTP on e1000_pch_lpt variantsJarod Wilson2016-08-161-1/+2
| | | * e1000e: factor out systim sanitizationJarod Wilson2016-08-163-29/+44
| | | * igb: fix adjusting PTP timestamps for Tx/Rx latencyKshitiz Gupta2016-08-161-3/+23
| | * | Merge branch 'mlxsw-fixes'David S. Miller2016-08-186-88/+83
| | |\ \ | | | |/ | | |/|
| | | * mlxsw: spectrum: Allow packets to be trapped from any PGIdo Schimmel2016-08-181-1/+1
| | | * mlxsw: spectrum: Unmap 802.1Q FID before destroying itIdo Schimmel2016-08-181-0/+2
| | | * mlxsw: spectrum: Add missing rollbacks in error pathIdo Schimmel2016-08-181-1/+3
| | | * mlxsw: reg: Fix missing op field fill-upJiri Pirko2016-08-181-0/+1