diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
| commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
| tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /net/econet/af_econet.c | |
| parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/econet/af_econet.c')
| -rw-r--r-- | net/econet/af_econet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c index 4a62093eb343..34fdac51df96 100644 --- a/net/econet/af_econet.c +++ b/net/econet/af_econet.c | |||
| @@ -406,7 +406,7 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
| 406 | unsigned long network = 0; | 406 | unsigned long network = 0; |
| 407 | 407 | ||
| 408 | rcu_read_lock(); | 408 | rcu_read_lock(); |
| 409 | idev = __in_dev_get(dev); | 409 | idev = __in_dev_get_rcu(dev); |
| 410 | if (idev) { | 410 | if (idev) { |
| 411 | if (idev->ifa_list) | 411 | if (idev->ifa_list) |
| 412 | network = ntohl(idev->ifa_list->ifa_address) & | 412 | network = ntohl(idev->ifa_list->ifa_address) & |