diff options
| author | Amerigo Wang <amwang@redhat.com> | 2011-05-20 01:39:10 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-23 05:01:19 +0400 |
| commit | 8d8fc29d02a33e4bd5f4fa47823c1fd386346093 (patch) | |
| tree | 822657741aca7297209c28c906f6b8caa43d163b /include/linux | |
| parent | a37dd3332319260cce81ac91ce25fcc3a31de997 (diff) | |
| download | linux-8d8fc29d02a33e4bd5f4fa47823c1fd386346093.tar.xz | |
netpoll: disable netpoll when enslave a device
V3: rename NETDEV_ENSLAVE to NETDEV_JOIN
Currently we do nothing when we enslave a net device which is running netconsole.
Neil pointed out that we may get weird results in such case, so let's disable
netpoll on the device being enslaved. I think it is too harsh to prevent
the device being ensalved if it is running netconsole.
By the way, this patch also removes the NETDEV_GOING_DOWN from netconsole
netdev notifier, because netpoll will check if the device is running or not
and we don't handle NETDEV_PRE_UP neither.
This patch is based on net-next-2.6.
Signed-off-by: WANG Cong <amwang@redhat.com>
Cc: Neil Horman <nhorman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/notifier.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/notifier.h b/include/linux/notifier.h index 621dfa16acc0..a577762afbe7 100644 --- a/include/linux/notifier.h +++ b/include/linux/notifier.h @@ -211,6 +211,7 @@ static inline int notifier_to_errno(int ret) #define NETDEV_UNREGISTER_BATCH 0x0011 #define NETDEV_BONDING_DESLAVE 0x0012 #define NETDEV_NOTIFY_PEERS 0x0013 +#define NETDEV_JOIN 0x0014 #define SYS_DOWN 0x0001 /* Notify of system down */ #define SYS_RESTART SYS_DOWN |