diff options
| author | Michal Marek <mmarek@suse.cz> | 2011-06-07 17:37:51 +0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2011-06-07 17:37:51 +0400 |
| commit | 2e483528cebad089d0bb3f9aebb0ada22d968ffa (patch) | |
| tree | d701405826b271e819a9a8500838cebd37b1364a /include/linux/notifier.h | |
| parent | 163d3fe6a2357aba7b18b938d6ae6ce9570324e4 (diff) | |
| parent | 55922c9d1b84b89cb946c777fddccb3247e7df2c (diff) | |
| download | linux-2e483528cebad089d0bb3f9aebb0ada22d968ffa.tar.xz | |
Merge commit 'v3.0-rc1' into kbuild/kbuild
Diffstat (limited to 'include/linux/notifier.h')
| -rw-r--r-- | include/linux/notifier.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/notifier.h b/include/linux/notifier.h index 2026f9e1ceb8..c0688b0168b3 100644 --- a/include/linux/notifier.h +++ b/include/linux/notifier.h @@ -209,8 +209,9 @@ static inline int notifier_to_errno(int ret) #define NETDEV_POST_TYPE_CHANGE 0x000F #define NETDEV_POST_INIT 0x0010 #define NETDEV_UNREGISTER_BATCH 0x0011 -#define NETDEV_BONDING_DESLAVE 0x0012 +#define NETDEV_RELEASE 0x0012 #define NETDEV_NOTIFY_PEERS 0x0013 +#define NETDEV_JOIN 0x0014 #define SYS_DOWN 0x0001 /* Notify of system down */ #define SYS_RESTART SYS_DOWN @@ -237,7 +238,7 @@ static inline int notifier_to_errno(int ret) * enabling interrupts. Must not sleep, * must not fail */ -/* Used for CPU hotplug events occuring while tasks are frozen due to a suspend +/* Used for CPU hotplug events occurring while tasks are frozen due to a suspend * operation in progress */ #define CPU_TASKS_FROZEN 0x0010 |