diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-20 19:41:44 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-20 19:41:44 +0200 |
| commit | 9cec58dc138d6fcad9f447a19c8ff69f6540e667 (patch) | |
| tree | 4fe1cca94fdba8b705c87615bee06d3346f687ce /net/irda/irlan/irlan_eth.c | |
| parent | [PATCH] Removed remaining PCI specific references from swiotlb.c (diff) | |
| parent | [PATCH] Fix handling spurious page fault for hugetlb region (diff) | |
| download | linux-9cec58dc138d6fcad9f447a19c8ff69f6540e667.tar.xz linux-9cec58dc138d6fcad9f447a19c8ff69f6540e667.zip | |
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'net/irda/irlan/irlan_eth.c')
| -rw-r--r-- | net/irda/irlan/irlan_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c index 071cd2cefd8a..953e255d2bc8 100644 --- a/net/irda/irlan/irlan_eth.c +++ b/net/irda/irlan/irlan_eth.c @@ -310,7 +310,7 @@ void irlan_eth_send_gratuitous_arp(struct net_device *dev) #ifdef CONFIG_INET IRDA_DEBUG(4, "IrLAN: Sending gratuitous ARP\n"); rcu_read_lock(); - in_dev = __in_dev_get(dev); + in_dev = __in_dev_get_rcu(dev); if (in_dev == NULL) goto out; if (in_dev->ifa_list) |