From 74a32d666a067e1a1715da42f0c1dec058341339 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Tue, 20 Apr 2010 01:45:37 -0700 Subject: [PATCH] --- yaml --- r: 194303 b: refs/heads/master c: ab9304717f7624c41927f442e6b6d418b2d8b3e4 h: refs/heads/master i: 194301: 7320edc2b920b33d4d6d3f907ede54d949e46e41 194299: 2495a0603b81f7a8a468c81c8ffa077374ed5d7a 194295: b5db1a69d104239eca8e25e21fe79888f9319c53 194287: 8df643ef312f2f35b2f0b82c6627459f1d7659be 194271: 4fe50bb0d04904bbb5265a2077751d69942c4caa 194239: e2f484a255da9879f36d72cf90547b6354de52be 194175: 0d310f0e8f2742940436eaabc772126c503ad537 194047: 012cb600ca78513c17e0414df71d4836b087dba1 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f1e4e1458e93..15d6e6a837b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b249dcb82d327e419d3cb45773b146ebb5faf419 +refs/heads/master: ab9304717f7624c41927f442e6b6d418b2d8b3e4 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 0d78e0454a6d..b31d5d69a467 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1435,6 +1435,7 @@ EXPORT_SYMBOL(unregister_netdevice_notifier); int call_netdevice_notifiers(unsigned long val, struct net_device *dev) { + ASSERT_RTNL(); return raw_notifier_call_chain(&netdev_chain, val, dev); }