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/wireless | |
| parent | 7cb3cd090c2725b80561958a362c2ba15a7a8c86 (diff) | |
| parent | 9123e0d78990246304fe681167b8d8097f1e02d7 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/strip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index 4b0acae22b0d..7bc7fc823128 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c | |||
| @@ -1352,7 +1352,7 @@ static unsigned char *strip_make_packet(unsigned char *buffer, | |||
| 1352 | struct in_device *in_dev; | 1352 | struct in_device *in_dev; |
| 1353 | 1353 | ||
| 1354 | rcu_read_lock(); | 1354 | rcu_read_lock(); |
| 1355 | in_dev = __in_dev_get(strip_info->dev); | 1355 | in_dev = __in_dev_get_rcu(strip_info->dev); |
| 1356 | if (in_dev == NULL) { | 1356 | if (in_dev == NULL) { |
| 1357 | rcu_read_unlock(); | 1357 | rcu_read_unlock(); |
| 1358 | return NULL; | 1358 | return NULL; |
| @@ -1508,7 +1508,7 @@ static void strip_send(struct strip *strip_info, struct sk_buff *skb) | |||
| 1508 | 1508 | ||
| 1509 | brd = addr = 0; | 1509 | brd = addr = 0; |
| 1510 | rcu_read_lock(); | 1510 | rcu_read_lock(); |
| 1511 | in_dev = __in_dev_get(strip_info->dev); | 1511 | in_dev = __in_dev_get_rcu(strip_info->dev); |
| 1512 | if (in_dev) { | 1512 | if (in_dev) { |
| 1513 | if (in_dev->ifa_list) { | 1513 | if (in_dev->ifa_list) { |
| 1514 | brd = in_dev->ifa_list->ifa_broadcast; | 1514 | brd = in_dev->ifa_list->ifa_broadcast; |