From: Jiri Pirko <jpirko@redhat.com>
To: David Miller <davem@davemloft.net>
Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: linux-next: build warning after merge of the net tree
Date: Mon, 15 Feb 2010 10:36:20 +0100 [thread overview]
Message-ID: <20100215093619.GA2644@psychotron.lab.eng.brq.redhat.com> (raw)
In-Reply-To: <20100214.225117.242995108.davem@davemloft.net>
Mon, Feb 15, 2010 at 07:51:17AM CET, davem@davemloft.net wrote:
>From: Stephen Rothwell <sfr@canb.auug.org.au>
>Date: Mon, 15 Feb 2010 14:32:57 +1100
>
>> After merging the net tree, today's linux-next build (x86_64 allmodconfig)
>> produced this warning:
>>
>> net/mac80211/iface.c: In function 'ieee80211_stop':
>> net/mac80211/iface.c:416: warning: passing argument 4 of '__dev_addr_unsync' makes pointer from integer without a cast
>> include/linux/netdevice.h:1967: note: expected 'int *' but argument is of type 'int'
>>
>> Introduced by commit 4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5 ("net: use
>> netdev_mc_count and netdev_mc_empty when appropriate").
>
>I'll fix this like so:
>
>mac80211: Fix error introduced in netdev_mc_count() changes.
>
>Commit 4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5
>("net: use netdev_mc_count and netdev_mc_empty when appropriate")
>added this hunk to net/mac80211/iface.c:
>
> __dev_addr_unsync(&local->mc_list, &local->mc_count,
>- &dev->mc_list, &dev->mc_count);
>+ &dev->mc_list, dev->mc_count);
>
>which is definitely not correct, introduced a warning (reported
>by Stephen Rothwell):
>
>net/mac80211/iface.c: In function 'ieee80211_stop':
>net/mac80211/iface.c:416: warning: passing argument 4 of '__dev_addr_unsync' makes pointer from integer without a cast
>include/linux/netdevice.h:1967: note: expected 'int *' but argument is of type 'int'
>
>and is thus reverted here.
Oups :( sorry about this. Must have missed that when reviewing spatch output..
Thanks David.
Jirka
>
>Signed-off-by: David S. Miller <davem@davemloft.net>
>---
> net/mac80211/iface.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
>index f943f5f..09fff46 100644
>--- a/net/mac80211/iface.c
>+++ b/net/mac80211/iface.c
>@@ -413,7 +413,7 @@ static int ieee80211_stop(struct net_device *dev)
> netif_addr_lock_bh(dev);
> spin_lock_bh(&local->filter_lock);
> __dev_addr_unsync(&local->mc_list, &local->mc_count,
>- &dev->mc_list, dev->mc_count);
>+ &dev->mc_list, &dev->mc_count);
> spin_unlock_bh(&local->filter_lock);
> netif_addr_unlock_bh(dev);
>
>--
>1.6.6.1
>
next prev parent reply other threads:[~2010-02-15 9:36 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-15 3:32 linux-next: build warning after merge of the net tree Stephen Rothwell
2010-02-15 6:21 ` David Miller
2010-02-15 6:51 ` David Miller
2010-02-15 9:36 ` Jiri Pirko [this message]
2010-03-01 5:47 Stephen Rothwell
2010-03-01 7:02 ` David Miller
2010-07-06 4:25 Stephen Rothwell
2010-07-08 0:45 ` David Miller
2010-07-08 1:18 ` David Miller
2010-07-08 4:13 ` Joe Perches
2010-07-11 2:52 ` David Miller
2010-08-31 2:57 ` Stephen Rothwell
2010-08-31 3:14 ` Joe Perches
2010-08-31 3:58 ` Stephen Rothwell
2010-08-31 4:03 ` Joe Perches
2010-08-31 4:46 ` David Miller
2010-08-31 4:45 ` David Miller
2010-08-31 4:42 ` David Miller
2010-07-07 4:30 Stephen Rothwell
2010-07-08 1:23 ` David Miller
2010-07-22 2:11 Stephen Rothwell
2010-07-22 4:09 ` David Miller
2011-05-09 3:46 Stephen Rothwell
2011-05-09 4:13 ` David Miller
2011-05-13 1:41 Stephen Rothwell
2011-05-13 3:04 ` David Miller
2014-09-18 0:32 Stephen Rothwell
2014-09-18 0:35 ` Randy Dunlap
2014-09-23 14:59 ` Michal Marek
2014-09-23 21:23 ` Stephen Rothwell
2014-09-24 0:36 ` Stephen Rothwell
2014-09-24 1:58 ` David Miller
2017-01-18 22:56 Stephen Rothwell
2017-01-19 8:26 ` Tariq Toukan
2017-06-13 11:08 Stephen Rothwell
2017-06-13 11:31 ` Ashwanth Goli
2017-08-22 23:34 Stephen Rothwell
2018-08-21 22:04 Stephen Rothwell
2018-08-22 19:26 ` Cong Wang
2019-01-14 4:15 Stephen Rothwell
2019-12-04 21:44 Stephen Rothwell
2019-12-05 22:57 ` David Miller
2019-12-05 23:48 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100215093619.GA2644@psychotron.lab.eng.brq.redhat.com \
--to=jpirko@redhat.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).