summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * sfc: RX buffer allocation takes prefix size into account in IP header alignmentAndrew Rybchenko2013-12-063-4/+9
| | * sfc: Maintain current frequency adjustment when applying a time offsetBen Hutchings2013-12-061-2/+2
| | * sfc: Stop/re-start PTP when stopping/starting the datapath.Alexandre Rames2013-12-063-3/+33
| | * sfc: Rate-limit log message for PTP packets without a matching timestamp eventBen Hutchings2013-12-061-2/+3
| | * sfc: PTP: Moderate log message on event queue overflowLaurence Evans2013-12-061-2/+21
| | * sfc: Add length checks to efx_xmit_with_hwtstamp() and efx_ptp_is_ptp_tx()Ben Hutchings2013-12-061-0/+4
* | | Merge branch 'bonding_netlink'David S. Miller2013-12-145-271/+578
|\ \ \
| * | | bonding: add arp_all_targets netlink supportsfeldma@cumulusnetworks.com2013-12-145-6/+37
| * | | bonding: add arp_validate netlink supportsfeldma@cumulusnetworks.com2013-12-145-22/+50
| * | | bonding: add arp_ip_target netlink supportsfeldma@cumulusnetworks.com2013-12-145-68/+187
| * | | bonding: add arp_interval netlink supportsfeldma@cumulusnetworks.com2013-12-145-51/+80
| * | | bonding: add use_carrier netlink supportsfeldma@cumulusnetworks.com2013-12-145-13/+39
| * | | bonding: add downdelay netlink supportsfeldma@cumulusnetworks.com2013-12-145-31/+52
| * | | bonding: add updelay netlink supportsfeldma@cumulusnetworks.com2013-12-145-32/+54
| * | | bonding: add miimon netlink supportsfeldma@cumulusnetworks.com2013-12-145-49/+80
|/ / /
* | | packet: fix using smp_processor_id() in preemptible codeLi Zhong2013-12-141-1/+1
* | | netconf: add proxy-arp supportstephen hemminger2013-12-142-12/+30