svn commit: r301495 - head/sys/dev/sfxge/common
Andrew Rybchenko
arybchik at FreeBSD.org
Mon Jun 6 09:30:32 UTC 2016
Author: arybchik
Date: Mon Jun 6 09:30:31 2016
New Revision: 301495
URL: https://svnweb.freebsd.org/changeset/base/301495
Log:
sfxge(4): update TX vFIFO ULL tag location to avoid merge conflict
Sponsored by: Solarflare Communications, Inc.
MFC after: 1 week
Modified:
head/sys/dev/sfxge/common/ef10_tlv_layout.h
Modified: head/sys/dev/sfxge/common/ef10_tlv_layout.h
==============================================================================
--- head/sys/dev/sfxge/common/ef10_tlv_layout.h Mon Jun 6 09:08:16 2016 (r301494)
+++ head/sys/dev/sfxge/common/ef10_tlv_layout.h Mon Jun 6 09:30:31 2016 (r301495)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2012-2015 Solarflare Communications Inc.
+ * Copyright (c) 2012-2016 Solarflare Communications Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -801,7 +801,7 @@ struct tlv_tx_event_merging_config {
* know if the low latency mode is enabled.
*/
-#define TLV_TAG_TX_VFIFO_ULL_MODE (0x10220000)
+#define TLV_TAG_TX_VFIFO_ULL_MODE (0x10270000)
struct tlv_tx_vfifo_ull_mode {
uint32_t tag;
uint32_t length;
More information about the svn-src-all
mailing list