summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ixgbevf'David S. Miller2014-01-174-370/+403
|\
| * ixgbevf: merge ixgbevf_tx_map and ixgbevf_tx_queue into a single functionEmil Tantilov2014-01-172-140/+133
| * ixgbevf: redo dma mapping using the tx buffer infoEmil Tantilov2014-01-172-40/+59
| * ixgbevf: make the first tx_buffer a repository for most of the skb infoEmil Tantilov2014-01-172-95/+130
| * ixgbevf: add tx countersEmil Tantilov2014-01-171-0/+2
| * ixgbevf: remove counters for Tx/Rx checksum offloadEmil Tantilov2014-01-173-20/+9
| * ixgbevf: move ring specific stats into ring specific structureEmil Tantilov2014-01-173-44/+62
| * ixgbevf: make use of the dev pointer in the ixgbevf_ring structEmil Tantilov2014-01-173-84/+61
|/
* Merge branch 'i40e'David S. Miller2014-01-1718-299/+1711
|\
| * i40e: Fix device ID define names to align to standardShannon Nelson2014-01-177-70/+70
| * i40e: add DCB option to KconfigNeerav Parikh2014-01-172-0/+10
| * i40e: add DCB and DCBNL supportNeerav Parikh2014-01-174-20/+669
| * i40e: implement DCB support infastructureNeerav Parikh2014-01-175-15/+712
| * i40e: refactor flow directorAnjali Singhai Jain2014-01-173-160/+221
| * i40e: rename definesJesse Brandeburg2014-01-174-33/+33
| * i40e: whitespace fixesJesse Brandeburg2014-01-174-5/+5
| * i40e: Change firmware workaroundJesse Brandeburg2014-01-172-7/+2
| * i40e: fix compile warning on checksum_localJesse Brandeburg2014-01-171-1/+1
| * Bluetooth: remove direct compilation of 6lowpan_iphc.cStephen Warren2014-01-171-4/+0
* | Bluetooth: remove direct compilation of 6lowpan_iphc.cStephen Warren2014-01-171-4/+0
|/
* virtio-net: fix build error when CONFIG_AVERAGE is not enabledMichael Dalton2014-01-171-0/+1
* Merge branch 'ixgbe'David S. Miller2014-01-173-4/+6
|\
| * ixgbevf: bump versionDon Skidmore2014-01-171-1/+1
| * ixgbe: bump version numberDon Skidmore2014-01-171-1/+1
| * ixgbe: add braces around else condition in ixgbe_qv_lock_* callsJacob Keller2014-01-171-2/+4
|/
* net: ftgmac100: use kfree_skb() where appropriateEric Dumazet2014-01-171-3/+3
* Merge branch 'bonding_slave_sysfs'David S. Miller2014-01-179-15/+294
|\
| * bonding: add netlink attributes to slave link devsfeldma@cumulusnetworks.com2014-01-176-2/+118
| * bonding: add sysfs /slave dir for bond slave devices.sfeldma@cumulusnetworks.com2014-01-175-13/+176
|/
* net: vxlan: do not use vxlan_net before checking event typeDaniel Borkmann2014-01-171-2/+4
* Merge branch 'ixgbe'David S. Miller2014-01-173-4/+9
|\
| * ixgbe: set driver_max_VFs should be done before enabling SRIOVethan.zhao2014-01-171-1/+1
| * ixgbe: define IXGBE_MAX_VFS_DRV_LIMIT macro and cleanup const 63ethan.zhao2014-01-173-4/+9
|/
* ipv4: fix a dst leak in tunnelsEric Dumazet2014-01-172-21/+14
* sh_eth: Add support for r7s72100Simon Horman2014-01-172-8/+119
* sh_eth: Use bool as return type of sh_eth_is_gether()Simon Horman2014-01-171-5/+2
* ipv6: send Change Status Report after DAD is completedFlavio Leitner2014-01-171-24/+33
* qlcnic: remove unused codestephen hemminger2014-01-172-31/+0
* qlcnic: make local functions staticstephen hemminger2014-01-1713-103/+97
* ipv6: tcp: fix flowlabel value in ACK messages send from TIME_WAITFlorent Fourcot2014-01-173-9/+15
* Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2014-01-17129-1794/+3808
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-01-17129-1794/+3808
|/|
| * carl9170: use ath_is_mybeaconOleksij Rempel2014-01-161-6/+3
| * ath5k: use ath_is_mybeaconOleksij Rempel2014-01-161-25/+8
| * ath9k_htc: use ath_is_mybeaconOleksij Rempel2014-01-161-3/+1
| * ath9k: use ath_is_mybeaconOleksij Rempel2014-01-161-16/+4
| * ath: add common function ath_is_mybeaconOleksij Rempel2014-01-162-0/+10
| * mwifiex: export threshold value and retry limit to cfg80211Ujjal Roy2014-01-161-0/+14
| * mwifiex: fix wrong 11ac bits setting in fw_cap_infoBing Zhao2014-01-161-1/+1
| * wil6210: correct #include for prefetch()Vladimir Kondratiev2014-01-161-1/+1