svn commit: r301987 - stable/10/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Fri Jun 17 09:05:26 2016
New Revision: 301987
URL: https://svnweb.freebsd.org/changeset/base/301987

Log:
  MFC r301495
  
  sfxge(4): update TX vFIFO ULL tag location to avoid merge conflict
  
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/common/ef10_tlv_layout.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/ef10_tlv_layout.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/ef10_tlv_layout.h	Fri Jun 17 09:04:06 2016	(r301986)
+++ stable/10/sys/dev/sfxge/common/ef10_tlv_layout.h	Fri Jun 17 09:05:26 2016	(r301987)
@@ -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;