summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh...David S. Miller2013-12-1410-217/+797
|\
| * sfc: Remove unnecessary condition for processing the TX timestamp queueBen Hutchings2013-12-121-12/+4
| * sfc: Don't clear timestamps in efx_ptp_rx()Ben Hutchings2013-12-121-6/+0
| * sfc: Enable PTP clock and timestamping for all functions on EF10Ben Hutchings2013-12-122-17/+30
| * sfc: Associate primary and secondary functions of controllerBen Hutchings2013-12-124-0/+93
| * sfc: Store VPD serial number at probe timeBen Hutchings2013-12-122-7/+34
| * sfc: Add RX packet timestamping for EF10Jon Cooper2013-12-127-15/+277
| * sfc: Copy RX prefix into skb head area in efx_rx_mk_skb()Ben Hutchings2013-12-122-12/+7
| * sfc: split setup of hardware timestamping into NIC-type operationDaniel Pieczko2013-12-124-72/+78
| * sfc: Add support for SFC9100 timestamp formatLaurence Evans2013-12-121-25/+231
| * sfc: Tidy up PTP synchronization codeLaurence Evans2013-12-121-20/+24
| * sfc: PTP - tidy up unused/useless variablesLaurence Evans2013-12-121-15/+1
| * sfc: Remove kernel-doc for efx_ptp_data fields not present in this versionBen Hutchings2013-12-121-15/+0
| * sfc: Initialise efx_ptp_data::phc_clock_info from a static templateBen Hutchings2013-12-121-14/+16
| * sfc: Do not use MAC address as clock nameBen Hutchings2013-12-121-3/+2
| * sfc: Store flags from MC_CMD_DRV_ATTACH for later useBen Hutchings2013-12-122-2/+18
* | ipv6: fix compiler warning in ipv6_exthdrs_lenHannes Frederic Sowa2013-12-141-4/+5
* | Merge branch 'bonding_rcu'David S. Miller2013-12-148-147/+130
|\ \
| * | bonding: rebuild the bond_resend_igmp_join_requests_delayed()dingtianhong2013-12-141-16/+5
| * | bonding: remove unwanted lock for bond_store_primaryxxx()dingtianhong2013-12-141-4/+0
| * | bonding: remove unwanted lock for bond_option_active_slave_set()dingtianhong2013-12-141-2/+0
| * | bonding: add RCU for bond_3ad_state_machine_handler()dingtianhong2013-12-142-26/+35
| * | bonding: remove unwanted lock for bond enslave and releasedingtianhong2013-12-141-21/+6
| * | bonding: rebuild the lock use for bond_activebackup_arp_mon()dingtianhong2013-12-141-25/+20
| * | bonding: create bond_first_slave_rcu()dingtianhong2013-12-143-0/+26
| * | bonding: rebuild the lock use for bond_loadbalance_arp_mon()dingtianhong2013-12-141-6/+12
| * | bonding: rebuild the lock use for bond_alb_monitor()dingtianhong2013-12-141-13/+9
| * | bonding: rebuild the lock use for bond_mii_monitor()dingtianhong2013-12-141-13/+11
| * | bonding: remove the no effect lock for bond_select_active_slave()dingtianhong2013-12-142-21/+6
|/ /
* | pkt_sched: set root qdisc before change() in attach_default_qdiscs()Eric Dumazet2013-12-142-2/+5
* | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh...David S. Miller2013-12-1420-421/+1418
|\ \ | |/
| * sfc: Remove dependency of PTP on having a dedicated channelBen Hutchings2013-12-123-24/+41
| * sfc: Split PTP multicast filter insertion/removal out of efx_ptp_{start,stop}()Ben Hutchings2013-12-121-17/+39
| * sfc: Return EBUSY for filter insertion on EF10, matching Falcon/SienaBen Hutchings2013-12-121-0/+2
| * sfc: Expose NVRAM_PARTITION_TYPE_LICENSE on EF10Ben Hutchings2013-12-121-0/+1
| * sfc: Fold efx_flush_all() into efx_stop_port() and update commentsBen Hutchings2013-12-121-18/+12
| * sfc: Map MCDI error MC_CMD_ERR_ENOTSUP to Linux EOPNOTSUPPBen Hutchings2013-12-121-0/+2
| * sfc: Log all unexpected MCDI errorsEdward Cree2013-12-125-229/+265
| * sfc: Add new sensor namesBen Hutchings2013-12-121-0/+3
| * sfc: Revise sensor names to be more understandable and consistentEdward Cree2013-12-121-23/+26
| * sfc: Report units in sensor warningsEdward Cree2013-12-121-4/+20
| * sfc: Correct RX dropped count for drops while interface is downJon Cooper2013-12-129-11/+83
| * sfc: Make initial fill of RX descriptors synchronousJon Cooper2013-12-125-9/+12
| * sfc: Tighten the check for RX merged completion eventsBen Hutchings2013-12-121-4/+9
| * sfc: Add MC BISTs to ethtool offline self test on EF10Jon Cooper2013-12-128-2/+152
| * sfc: Update MCDI protocol definitionsBen Hutchings2013-12-061-70/+663
| * sfc: Demote "MC Scheduler error" messagesRobert Stonehouse2013-12-061-2/+2
| * Merge branch 'sfc-3.13' into masterBen Hutchings2013-12-066-23/+101
| |\
| | * sfc: Poll for MCDI completion once before timeout occursRobert Stonehouse2013-12-061-4/+12
| | * sfc: Refactor efx_mcdi_poll() by introducing efx_mcdi_poll_once()Robert Stonehouse2013-12-061-6/+17
OpenPOWER on IntegriCloud