Index: head/sys/compat/linuxkpi/common/include/linux/notifier.h
===================================================================
--- head/sys/compat/linuxkpi/common/include/linux/notifier.h	(revision 294825)
+++ head/sys/compat/linuxkpi/common/include/linux/notifier.h	(revision 294826)
@@ -1,59 +1,57 @@
 /*-
  * Copyright (c) 2010 Isilon Systems, Inc.
  * Copyright (c) 2010 iX Systems, Inc.
  * Copyright (c) 2010 Panasas, Inc.
- * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
+ * Copyright (c) 2013-2016 Mellanox Technologies, Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice unmodified, this list of conditions, and the following
  *    disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 #ifndef	_LINUX_NOTIFIER_H_
 #define	_LINUX_NOTIFIER_H_
 
 #include <sys/types.h>
 #include <sys/eventhandler.h>
 
-/*
- * Max number of FreeBSD events to map to Linux events per notify type.
- */
 #define	NOTIFY_DONE	0
-#define	_NOTIFY_COUNT	7
 
+enum {
+	NETDEV_CHANGE,
+	NETDEV_UP,
+	NETDEV_DOWN,
+	NETDEV_REGISTER,
+	NETDEV_UNREGISTER,
+	NETDEV_CHANGEADDR,
+	NETDEV_CHANGEIFADDR,
+	LINUX_NOTIFY_TAGS		/* must be last */
+};
+
 struct notifier_block {
-	int (*notifier_call)(struct notifier_block *, unsigned long, void *);
-	struct notifier_block	*next;
-	int			priority;
-	eventhandler_tag	tags[_NOTIFY_COUNT];
+	int     (*notifier_call) (struct notifier_block *, unsigned long, void *);
+	struct notifier_block *next;
+	int	priority;
+	eventhandler_tag tags[LINUX_NOTIFY_TAGS];
 };
 
-/* Values must be less than NOTIFY_COUNT */
-#define	NETDEV_UP		0x0001
-#define	NETDEV_DOWN		0x0002
-#define	NETDEV_REGISTER		0x0003
-#define	NETDEV_UNREGISTER	0x0004
-#define	NETDEV_CHANGEADDR       0x0005
-#define	NETDEV_CHANGEIFADDR     0x0006
-
-
-#endif	/* _LINUX_NOTIFIER_H_ */
+#endif					/* _LINUX_NOTIFIER_H_ */