From: David S. Miller Date: Mon, 31 May 2010 07:28:35 +0000 (-0700) Subject: net: Fix NETDEV_NOTIFY_PEERS to not conflict with NETDEV_BONDING_DESLAVE. X-Git-Tag: v2.6.34.4~11 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a8121b31c5ada47a87e73c4879ae7d345836a455;p=karo-tx-linux.git net: Fix NETDEV_NOTIFY_PEERS to not conflict with NETDEV_BONDING_DESLAVE. commit 38117d1495e587fbb10d6e55733139a27893cef5 upstream. Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/include/linux/notifier.h b/include/linux/notifier.h index 45477f24f1da..a4b7f97abc19 100644 --- a/include/linux/notifier.h +++ b/include/linux/notifier.h @@ -203,7 +203,7 @@ static inline int notifier_to_errno(int ret) #define NETDEV_BONDING_NEWTYPE 0x000F #define NETDEV_POST_INIT 0x0010 #define NETDEV_UNREGISTER_BATCH 0x0011 -#define NETDEV_NOTIFY_PEERS 0x0012 +#define NETDEV_NOTIFY_PEERS 0x0013 #define SYS_DOWN 0x0001 /* Notify of system down */ #define SYS_RESTART SYS_DOWN