diff options
author | Patrick McHardy <kaber@trash.net> | 2010-03-19 00:42:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-21 21:31:34 -0400 |
commit | 755d0e77ac9c8d125388922dc33434ed5b2ebe80 (patch) | |
tree | c63cd067dac50bfc9f912f7ab9e3a6b8e850af7f | |
parent | 3e81c6da39a265e11ef48f52bd15bf7ca0068c75 (diff) |
net: rtnetlink: ignore NETDEV_PRE_TYPE_CHANGE in rtnetlink_event()
Ignore the new NETDEV_PRE_TYPE_CHANGE event in rtnetlink_event() since
there have been no changes userspace needs to be notified of.
Also add a comment to the netdev notifier event definitions to remind
people to update the exclusion list when adding new event types.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/linux/notifier.h | 5 | ||||
-rw-r--r-- | net/core/rtnetlink.c | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/notifier.h b/include/linux/notifier.h index f3635fc6e942..9c5d3fad01f3 100644 --- a/include/linux/notifier.h +++ b/include/linux/notifier.h | |||
@@ -182,7 +182,10 @@ static inline int notifier_to_errno(int ret) | |||
182 | * VC switch chains (for loadable kernel svgalib VC switch helpers) etc... | 182 | * VC switch chains (for loadable kernel svgalib VC switch helpers) etc... |
183 | */ | 183 | */ |
184 | 184 | ||
185 | /* netdevice notifier chain */ | 185 | /* netdevice notifier chain. Please remember to update the rtnetlink |
186 | * notification exclusion list in rtnetlink_event() when adding new | ||
187 | * types. | ||
188 | */ | ||
186 | #define NETDEV_UP 0x0001 /* For now you can't veto a device up/down */ | 189 | #define NETDEV_UP 0x0001 /* For now you can't veto a device up/down */ |
187 | #define NETDEV_DOWN 0x0002 | 190 | #define NETDEV_DOWN 0x0002 |
188 | #define NETDEV_REBOOT 0x0003 /* Tell a protocol stack a network interface | 191 | #define NETDEV_REBOOT 0x0003 /* Tell a protocol stack a network interface |
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index e1121f0bca6a..ffc6cf3495ac 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
@@ -1513,6 +1513,7 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi | |||
1513 | case NETDEV_POST_INIT: | 1513 | case NETDEV_POST_INIT: |
1514 | case NETDEV_REGISTER: | 1514 | case NETDEV_REGISTER: |
1515 | case NETDEV_CHANGE: | 1515 | case NETDEV_CHANGE: |
1516 | case NETDEV_PRE_TYPE_CHANGE: | ||
1516 | case NETDEV_GOING_DOWN: | 1517 | case NETDEV_GOING_DOWN: |
1517 | case NETDEV_UNREGISTER: | 1518 | case NETDEV_UNREGISTER: |
1518 | case NETDEV_UNREGISTER_BATCH: | 1519 | case NETDEV_UNREGISTER_BATCH: |