summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* net: phy: resume/suspend PHYs on attach/detachSebastian Hesselbarth2013-12-171-0/+3
* net: phy: provide phy_resume/phy_suspend helpersSebastian Hesselbarth2013-12-171-0/+24
* net: phy: marvell: provide genphy suspend/resumeSebastian Hesselbarth2013-12-171-0/+22
* net: mv643xx_eth: properly start/stop phy deviceSebastian Hesselbarth2013-12-171-1/+3
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2013-12-178-90/+469
|\
| * i40e: Remove FCoE in i40e_virtchnl_pf.c codeNeerav Parikh2013-12-161-27/+2
| * i40e: support for suspend and resumeShannon Nelson2013-12-162-1/+97
| * i40e: rtnl_lock in reset path fixesAnjali Singhai Jain2013-12-163-5/+23
| * i40e: Add basic support for get/set channels for RSSAnjali Singhai Jain2013-12-161-0/+90
| * i40e: function to reconfigure RSS queues and rebuildAnjali Singhai Jain2013-12-162-8/+50
| * i40e: reinit flow for the main VSIAnjali Singhai Jain2013-12-161-21/+97
| * i40e: use same number of queues as CPUsJesse Brandeburg2013-12-161-4/+3
| * i40e: trivial fixesJesse Brandeburg2013-12-163-3/+3
| * i40e: init flow control settings to disabledJesse Brandeburg2013-12-162-9/+60
| * i40e: Tell the stack about our actual number of queuesAnjali Singhai Jain2013-12-161-0/+10
| * i40e: fix pf reset after offline testShannon Nelson2013-12-161-6/+8
| * i40e: fix up some of the ethtool connection reportingJesse Brandeburg2013-12-162-8/+28
* | fddi: cleanup unsigned to unsigned int/shorttanxiaojun2013-12-164-73/+73
|/
* 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
* | 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-141-0/+4
* | 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
* | 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
OpenPOWER on IntegriCloud