summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bonding: use last_arp_rx in bond_loadbalance_arp_mon()Veaceslav Falico2014-02-181-2/+2
* bonding: use last_arp_rx in slave_last_rx()Veaceslav Falico2014-02-181-7/+3
* bonding: use the new options to correctly set last_arp_rxVeaceslav Falico2014-02-181-7/+8
* bonding: document the new _arp options for arp_validateVeaceslav Falico2014-02-181-30/+66
* bonding: extend arp_validate to be able to receive unvalidated arp-only trafficVeaceslav Falico2014-02-182-5/+19
* bonding: always set recv_probe to bond_arp_rcv in arp monitorVeaceslav Falico2014-02-182-4/+2
* bonding: always update last_arp_rx on packet recieveVeaceslav Falico2014-02-181-0/+2
* bonding: permit using arp_validate with non-ab modesVeaceslav Falico2014-02-183-8/+5
* bonding: remove bond->lock from bond_arp_rcvVeaceslav Falico2014-02-181-3/+0
* Merge branch 'r8152'David S. Miller2014-02-181-185/+526
|\
| * r8152: support get_msglevel and set_msglevelhayeswang2014-02-181-0/+16
| * r8152: set disable_hub_initiated_lpmhayeswang2014-02-181-0/+1
| * r8152: replace netif_rx with netif_receive_skbhayeswang2014-02-181-1/+1
| * r8152: disable teredo for RTL8152hayeswang2014-02-181-0/+1
| * r8152: support runtime suspendhayeswang2014-02-181-23/+158
| * r8152: support WOLhayeswang2014-02-181-13/+105
| * r8152: move some functions from probe to openhayeswang2014-02-181-20/+25
| * r8152: combine PHY reset with set_speedhayeswang2014-02-181-12/+45
| * r8152: clear BMCR_PDOWNhayeswang2014-02-181-2/+13
| * r8152: reduce the frequency of spin_lockhayeswang2014-02-181-9/+38
| * r8152: load the default MAC addresshayeswang2014-02-181-2/+17
| * r8152: replace some types from int to boolhayeswang2014-02-181-10/+10
| * r8152: add three functionshayeswang2014-02-181-48/+51
| * r8152: move some functionshayeswang2014-02-181-53/+53
|/
* Merge branch 'cxgb4'David S. Miller2014-02-186-30/+119
|\
| * cxgb4: Add more PCI device ids.Hariprasad Shenai2014-02-181-0/+4
| * cxgb4: Don't assume LSO only uses SGL path in t4_eth_xmit()Kumar Sanghvi2014-02-181-10/+22
| * cxgb4: Remove unused registers and add missing onesKumar Sanghvi2014-02-181-2/+2
| * cxgb4: Query firmware for T5 ULPTX MEMWRITE DSGL capabilitiesKumar Sanghvi2014-02-184-0/+19
| * cxgb4: LE-Workaround is not atomic in firmwareKumar Sanghvi2014-02-181-1/+5
| * cxgb4: Allow >10G ports to have multiple queuesKumar Sanghvi2014-02-181-4/+5
| * cxgb4: Print adapter VPD Part Number instead of Engineering Change fieldKumar Sanghvi2014-02-183-3/+8
| * cxgb4: Add support to recognize 40G linksKumar Sanghvi2014-02-184-10/+54
|/
* Merge branch 'msix'David S. Miller2014-02-1828-400/+295
|\
| * wil6210: Use pci_enable_msi_range() instead of pci_enable_msi_block()Alexander Gordeev2014-02-181-17/+15
| * vmxnet3: Use pci_enable_msix_range() instead of pci_enable_msix()Alexander Gordeev2014-02-181-28/+19
| * vmxnet3: Fix MSI-X/MSI enablement codeAlexander Gordeev2014-02-181-55/+46
| * niu: Use pci_enable_msix_range() instead of pci_enable_msix()Alexander Gordeev2014-02-181-8/+3
| * sfc: Use pci_enable_msix_range() instead of pci_enable_msix()Alexander Gordeev2014-02-181-11/+9
| * qlge: Use pci_enable_msix_range() instead of pci_enable_msix()Alexander Gordeev2014-02-181-11/+4
| * qlge: Get rid of an redundant assignmentAlexander Gordeev2014-02-181-1/+0
| * qlcnic: Use pci_enable_msix_range() instead of pci_enable_msix()Alexander Gordeev2014-02-181-2/+6
| * qlcnic: Cleanup qlcnic_enable_msix() return valuesAlexander Gordeev2014-02-181-5/+5
| * netxen: Use pci_enable_msix_range() instead of pci_enable_msix()Alexander Gordeev2014-02-181-2/+3
| * forcedeth: Use pci_enable_msix_range() instead of pci_enable_msix()Alexander Gordeev2014-02-181-2/+5
| * forcedeth: Cleanup MSI-X to MSI to INTx fallback codeAlexander Gordeev2014-02-181-6/+6
| * forcedeth: Fix invalid errno reporting in nv_request_irq()Alexander Gordeev2014-02-181-8/+14
| * vxge: Use pci_enable_msix_range() instead of pci_enable_msix()Alexander Gordeev2014-02-181-6/+9
| * s2io: Use pci_enable_msix_range() instead of pci_enable_msix()Alexander Gordeev2014-02-181-2/+3
| * myri10ge: Use pci_enable_msix_range() instead of pci_enable_msix()Alexander Gordeev2014-02-181-20/+20