diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2008-05-08 11:53:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-08 11:53:17 +0200 |
| commit | e46b66bc42b6b1430b04cc5c207ecb2b2f4553dc (patch) | |
| tree | 3d54cec5d517a96e7e50911c4fc74ad6346e925a /net | |
| parent | can: Fix can_send() handling on dev_queue_xmit() failures (diff) | |
| download | linux-e46b66bc42b6b1430b04cc5c207ecb2b2f4553dc.tar.xz linux-e46b66bc42b6b1430b04cc5c207ecb2b2f4553dc.zip | |
net: Added ASSERT_RTNL() to dev_open() and dev_close().
dev_open() and dev_close() must be called holding the RTNL, since they
call device functions and netdevice notifiers that are promised the RTNL.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 4addaf0df96e..a1607bc0cd4c 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -994,6 +994,8 @@ int dev_open(struct net_device *dev) { int ret = 0; + ASSERT_RTNL(); + /* * Is it already up? */ @@ -1060,6 +1062,8 @@ int dev_open(struct net_device *dev) */ int dev_close(struct net_device *dev) { + ASSERT_RTNL(); + might_sleep(); if (!(dev->flags & IFF_UP)) |