diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
| commit | 3c8c7b2f32c52b259daa7564fefd582146799b23 (patch) | |
| tree | 59ff1ad0d6b7821d474d8fccafd884703684b6d7 /drivers/net/wan/syncppp.c | |
| parent | 7cb3cd090c2725b80561958a362c2ba15a7a8c86 (diff) | |
| parent | 9123e0d78990246304fe681167b8d8097f1e02d7 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/wan/syncppp.c')
| -rw-r--r-- | drivers/net/wan/syncppp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c index 3731b22f6757..2d1bba06a085 100644 --- a/drivers/net/wan/syncppp.c +++ b/drivers/net/wan/syncppp.c | |||
| @@ -767,7 +767,7 @@ static void sppp_cisco_input (struct sppp *sp, struct sk_buff *skb) | |||
| 767 | u32 addr = 0, mask = ~0; /* FIXME: is the mask correct? */ | 767 | u32 addr = 0, mask = ~0; /* FIXME: is the mask correct? */ |
| 768 | #ifdef CONFIG_INET | 768 | #ifdef CONFIG_INET |
| 769 | rcu_read_lock(); | 769 | rcu_read_lock(); |
| 770 | if ((in_dev = __in_dev_get(dev)) != NULL) | 770 | if ((in_dev = __in_dev_get_rcu(dev)) != NULL) |
| 771 | { | 771 | { |
| 772 | for (ifa=in_dev->ifa_list; ifa != NULL; | 772 | for (ifa=in_dev->ifa_list; ifa != NULL; |
| 773 | ifa=ifa->ifa_next) { | 773 | ifa=ifa->ifa_next) { |