summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bridge: adhere to querier election mechanism specified by RFCsLinus Lüssing2014-06-112-13/+95
* bridge: rename struct bridge_mcast_query/querierLinus Lüssing2014-06-113-95/+100
* Merge branch 'cxgb4'David S. Miller2014-06-1112-57/+356
|\
| * cxgb4: Change default Interrupt Holdoff Packet Count ThresholdHariprasad Shenai2014-06-112-30/+40
| * iw_cxgb4: don't truncate the recv window sizeHariprasad Shenai2014-06-113-4/+53
| * iw_cxgb4: Choose appropriate hw mtu index and ISS for iWARP connectionsHariprasad Shenai2014-06-115-15/+180
| * iw_cxgb4: Allocate and use IQs specifically for indirect interruptsHariprasad Shenai2014-06-118-9/+84
|/
* gre: allow changing mac address when device is upstephen hemminger2014-06-111-0/+1
* tcp: add gfp parameter to tcp_fragmentOctavian Purdila2014-06-113-10/+12
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2014-06-1112-113/+303
|\
| * i40e/i40evf: bump version to 0.4.7 for i40e and 0.9.31 for i40evfShannon Nelson2014-06-092-2/+2
| * i40e: Allow RSS table entry range and GPS to be any number, not necessarily p...Anjali Singhai Jain2014-06-091-3/+1
| * i40e: Delete stale MAC filters after changeGreg Rose2014-06-091-8/+5
| * i40e: Do not fall back to one queue model if the only feature enabled is ATRAnjali Singhai Jain2014-06-091-0/+1
| * i40e/i40evf: add PPRS bit to error bits and fix bug in Rx checksumJesse Brandeburg2014-06-095-40/+115
| * i40e: keep SR-IOV enabled in the case that RSS, VMDQ, FD_SB and DCB are disabledFrank Zhang2014-06-091-3/+13
| * i40e: Changes to Interrupt distribution policyAnjali Singhai Jain2014-06-091-6/+19
| * i40e: implement anti-spoofing for VFsMitch Williams2014-06-093-2/+60
| * i40e: don't complain about removing non-existent addressesShannon Nelson2014-06-091-2/+5
| * i40e: remove unused variable and memory allocationShannon Nelson2014-06-092-11/+0
| * i40e: allow for more VSIsMitch Williams2014-06-095-35/+45
| * i40evf: Fix function headerCatherine Sullivan2014-06-091-1/+1
| * i40e: add checks for AQ error status bitsShannon Nelson2014-06-091-0/+36
|/
* Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2014-06-089-38/+116
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-06-069-38/+116
| |\
| | * at76c50x: fix scan does not work with latest mac80211Andrea Merello2014-06-052-0/+54
| | * Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-06-057-38/+62
| | |\
| | | * Bluetooth: Fix L2CAP deadlockJukka Taimisto2014-06-021-1/+4
| | | * Bluetooth: Fix missing check for FIPS security levelJohan Hedberg2014-06-021-1/+2
| | | * Bluetooth: Fix requiring SMP MITM for outgoing connectionsJohan Hedberg2014-06-011-3/+4
| | | * Bluetooth: l2cap: Set more channel defaultsJukka Rissanen2014-05-311-0/+6
| | | * Bluetooth: 6LoWPAN: Fix MAC address universal/local bit handlingJukka Rissanen2014-05-311-30/+35
| | | * Bluetooth: Fix authentication check for FIPS security levelJohan Hedberg2014-05-311-0/+1
| | | * Bluetooth: Fix properly ignoring LTKs of unknown typesJohan Hedberg2014-05-311-2/+8
| | | * Bluetooth: ath3k: no need to set same pipe multiple timesAdam Lee2014-05-271-1/+2
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2014-06-0818-156/+74
|\ \ \ \
| * | | | i40e/i40evf: Bump build versionCatherine Sullivan2014-06-082-2/+2
| * | | | i40e/i40evf: remove deprecated device IDsJesse Brandeburg2014-06-085-11/+1
| * | | | i40e/i40evf: fix poll weightJesse Brandeburg2014-06-082-2/+2
| * | | | i40e/i40evf: fix TSO accountingJesse Brandeburg2014-06-084-16/+6
| * | | | i40e/i40evf: remove chatty reset messagesMitch Williams2014-06-082-11/+4
| * | | | i40e: not all VSIs have ringsMitch Williams2014-06-081-2/+2
| * | | | i40e: clear pxe after adminq is rebuiltShannon Nelson2014-06-081-0/+1
| * | | | i40e: Fix incorrect feature configuration statusAkeem G Abodunrin2014-06-081-3/+4
| * | | | i40evf: use correct format for printing MAC addressesMitch Williams2014-06-081-2/+2
| * | | | i40evf: clean up log message formattingMitch Williams2014-06-082-14/+14
| * | | | i40evf: remove bogus commentMitch Williams2014-06-081-3/+0
| * | | | i40evf: remove unnecessary log messagesMitch Williams2014-06-082-38/+16
| * | | | i40e/i40evf: Clean up a few thingsAkeem G Abodunrin2014-06-084-12/+1
| * | | | i40e/i40evf: Fix code to accommodate i40e_register.h changesAnjali Singhai Jain2014-06-085-33/+8