aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-31 00:28:35 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-13 13:31:06 -0700
commit488a52f0cbf44b44ebec2f52e172e8c83adad41b (patch)
tree921732ac6f41e6267f9add277a69c2c8cbb06049
parent60bee7a88f10d0e7f4595dbd81f53daf37833383 (diff)
downloadlinux-2.6.34-ux500-488a52f0cbf44b44ebec2f52e172e8c83adad41b.tar.gz
net: Fix NETDEV_NOTIFY_PEERS to not conflict with NETDEV_BONDING_DESLAVE.
commit 38117d1495e587fbb10d6e55733139a27893cef5 upstream. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--include/linux/notifier.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index 22c2abb6197..b2f1a4d8355 100644
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -210,7 +210,7 @@ static inline int notifier_to_errno(int ret)
#define NETDEV_POST_INIT 0x0010
#define NETDEV_UNREGISTER_BATCH 0x0011
#define NETDEV_BONDING_DESLAVE 0x0012
-#define NETDEV_NOTIFY_PEERS 0x0012
+#define NETDEV_NOTIFY_PEERS 0x0013
#define SYS_DOWN 0x0001 /* Notify of system down */
#define SYS_RESTART SYS_DOWN