diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-31 03:28:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-31 03:28:35 -0400 |
| commit | 38117d1495e587fbb10d6e55733139a27893cef5 (patch) | |
| tree | 3bfcad4d5f879e3ee1f74893bd00fdbedbf8b21d /include/linux | |
| parent | 06f555f35fcc917c2b3c32fe151ec370ad47db35 (diff) | |
net: Fix NETDEV_NOTIFY_PEERS to not conflict with NETDEV_BONDING_DESLAVE.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/notifier.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/notifier.h b/include/linux/notifier.h index 22c2abb61974..b2f1a4d83550 100644 --- a/include/linux/notifier.h +++ b/include/linux/notifier.h | |||
| @@ -210,7 +210,7 @@ static inline int notifier_to_errno(int ret) | |||
| 210 | #define NETDEV_POST_INIT 0x0010 | 210 | #define NETDEV_POST_INIT 0x0010 |
| 211 | #define NETDEV_UNREGISTER_BATCH 0x0011 | 211 | #define NETDEV_UNREGISTER_BATCH 0x0011 |
| 212 | #define NETDEV_BONDING_DESLAVE 0x0012 | 212 | #define NETDEV_BONDING_DESLAVE 0x0012 |
| 213 | #define NETDEV_NOTIFY_PEERS 0x0012 | 213 | #define NETDEV_NOTIFY_PEERS 0x0013 |
| 214 | 214 | ||
| 215 | #define SYS_DOWN 0x0001 /* Notify of system down */ | 215 | #define SYS_DOWN 0x0001 /* Notify of system down */ |
| 216 | #define SYS_RESTART SYS_DOWN | 216 | #define SYS_RESTART SYS_DOWN |