From ca9f36bea90372569c20b1a767ce632d652610c4 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Mon, 9 Jan 2012 06:18:34 +0000 Subject: [PATCH] --- yaml --- r: 281967 b: refs/heads/master c: ab16ebf375f0513d6b0f5193de84186a3fc0c33b h: refs/heads/master i: 281965: 80931f6cae2df62e4cb1106a443f9646dcb97a42 281963: 340015690979d0995151d76a66c7ee3a9ee1d15b 281959: 8d7e6590a93ecd508a831b31a26ea6123ebb6075 281951: 742466116803cc7ef1471644c3c60b59c4302d92 v: v3 --- [refs] | 2 +- trunk/net/core/dev_addr_lists.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4c5ab46614ec..6bbfa530bc68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 475f1b52645a29936b9df1d8fcd45f7e56bd4a9f +refs/heads/master: ab16ebf375f0513d6b0f5193de84186a3fc0c33b diff --git a/trunk/net/core/dev_addr_lists.c b/trunk/net/core/dev_addr_lists.c index febba516db62..c34ce9f9c976 100644 --- a/trunk/net/core/dev_addr_lists.c +++ b/trunk/net/core/dev_addr_lists.c @@ -427,7 +427,7 @@ EXPORT_SYMBOL(dev_uc_del); * * Add newly added addresses to the destination device and release * addresses that have no users left. The source device must be - * locked by netif_tx_lock_bh. + * locked by netif_addr_lock_bh. * * This function is intended to be called from the dev->set_rx_mode * function of layered software devices. @@ -590,7 +590,7 @@ EXPORT_SYMBOL(dev_mc_del_global); * * Add newly added addresses to the destination device and release * addresses that have no users left. The source device must be - * locked by netif_tx_lock_bh. + * locked by netif_addr_lock_bh. * * This function is intended to be called from the ndo_set_rx_mode * function of layered software devices.