summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pciLinus Torvalds2012-07-251-2/+2
|\
| * PCI: replace struct pci_bus secondary/subordinate with busn_resYinghai Lu2012-06-131-2/+2
* | Merge tag 'rdma-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2012-07-249-130/+206
|\ \
| | \
| | \
| *-. \ Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma'...Roland Dreier2012-07-239-130/+206
| |\ \ \
| | | * | net/mlx4_core: Free ICM table in case of errorDotan Barak2012-07-111-0/+2
| | | * | mlx4_core: Remove double function declarationsDotan Barak2012-07-111-6/+0Star
| | |/ / | |/| |
| | * | mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct and par...Jack Morgenstein2012-07-114-7/+83
| | * | mlx4_core: Allow guests to have IB portsJack Morgenstein2012-07-112-45/+59
| | * | mlx4_core: Implement mechanism for reserved Q_KeysJack Morgenstein2012-07-111-0/+17
| | * | net/mlx4_core: Initialize IB port capabilities for all slavesJack Morgenstein2012-07-101-0/+11
| | * | mlx4: Use port management change event instead of smp_snoopJack Morgenstein2012-07-105-69/+27Star
| | * | mlx4_core: Pass an invalid PCI id number to VFsJack Morgenstein2012-07-091-3/+7
| |/ /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-07-244-4/+4
|\ \ \
| * | | Change email address for Steve GlendinningSteve Glendinning2012-07-173-3/+3
| * | | treewide: Put a space between #include and FILEPaul Bolle2012-06-281-1/+1
* | | | r8169: revert "add byte queue limit support".Francois Romieu2012-07-241-22/+5Star
* | | | bnx2x: Add new 57840 device IDsYuval Mintz2012-07-233-10/+38
* | | | niu: Change niu_rbr_fill() to use unlikely() to check niu_rbr_add_page() retu...Shuah Khan2012-07-231-1/+1
* | | | niu: Fix to check for dma mapping errors.Shuah Khan2012-07-231-0/+4
* | | | net: ethernet: davinci_emac: add pm_runtime supportMark A. Greer2012-07-221-21/+22
* | | | net: ethernet: davinci_emac: Remove unnecessary #includeMark A. Greer2012-07-221-2/+0Star
* | | | tun: experimental zero copy tx supportMichael S. Tsirkin2012-07-221-12/+134
* | | | tun: orphan frags on xmitMichael S. Tsirkin2012-07-221-0/+2
* | | | ixgbe: Fix build with PCI_IOV enabled.David S. Miller2012-07-221-1/+1
* | | | forcedeth: advertise transmit time stampingRichard Cochran2012-07-221-0/+1
* | | | e1000e: advertise transmit time stampingRichard Cochran2012-07-221-0/+1
* | | | e1000: advertise transmit time stampingRichard Cochran2012-07-221-0/+1
* | | | bnx2x: advertise transmit time stampingRichard Cochran2012-07-221-0/+1
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2012-07-2210-209/+323
|\ \ \ \
| * | | | igb: reset PHY in the link_up process to recover PHY setting after power down.Akeem G. Abodunrin2012-07-221-1/+2
| * | | | ixgbe: Use 1TC DCB instead of disabling DCB for MSI and legacy interruptsAlexander Duyck2012-07-222-7/+17
| * | | | ixgbe: add support for new 82599 deviceDon Skidmore2012-07-222-0/+2
| * | | | ixgbe: remove extra unused queues in DCB + FCoE caseJohn Fastabend2012-07-221-5/+8
| * | | | ixgbe: fix RAR entry counting for generic and fdb_add()John Fastabend2012-07-221-8/+19
| * | | | ixgbe: Use num_tcs.pg_tcs as upper limit for TC when checking based on UPAlexander Duyck2012-07-221-4/+8
| * | | | ixgbe: Reduce Rx header size to what is actually usedAlexander Duyck2012-07-222-9/+10
| * | | | ixgbevf: Fix namespace issue with ixgbe_write_eitrGreg Rose2012-07-222-25/+19Star
| * | | | ixgbe: Fix handling of FDIR_HASH flagAlexander Duyck2012-07-222-24/+46
| * | | | ixgbevf: Add support for PCI error handlingAlexander Duyck2012-07-221-0/+80
| * | | | ixgbevf: Add lock around mailbox ops to prevent simultaneous accessAlexander Duyck2012-07-222-2/+41
| * | | | ixgbe: Change how we check for pre-existing and assigned VFsAlexander Duyck2012-07-224-94/+45Star
| * | | | ixgbe: Drop probe_vf and merge functionality into ixgbe_enable_sriovAlexander Duyck2012-07-223-32/+28Star
* | | | | wimax: fix printk format warningsRandy Dunlap2012-07-222-3/+3
* | | | | net: fix race condition in several drivers when reading statsKevin Groeneveld2012-07-224-12/+12
|/ / / /
* | | | forcedeth: spin_unlock_irq in interrupt handler fixDenis Efremov2012-07-211-2/+2
* | | | atl1c: fix issue of io access mode for AR8152 v2.1Cloud Ren2012-07-202-1/+20
* | | | tun: fix a crash bug and a memory leakMikulas Patocka2012-07-201-0/+3
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2012-07-2010-248/+344
|\ \ \ \
| * | | | ixgbe: Enable FCoE FSO and CRC offloads based on CAPABLE instead of ENABLED flagAlexander Duyck2012-07-202-8/+13
| * | | | ixgbe: Only enable anti-spoof on VF poolsAlexander Duyck2012-07-201-9/+11