From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "John W. Linville" <linville@tuxdriver•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jiri Pirko <jpirko@redhat•com>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org,
Saravanan Dhanabal <ext-saravanan.dhanabal@nokia•com>,
Luciano Coelho <luciano.coelho@nokia•com>
Subject: linux-next: manual merge of the wireless tree with the net tree
Date: Mon, 12 Apr 2010 14:05:17 +1000 [thread overview]
Message-ID: <20100412140517.f433690b.sfr@canb.auug.org.au> (raw)
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/wl12xx/wl1271_main.c between commit
22bedad3ce112d5ca1eaf043d4990fa2ed698c87 ("net: convert multicast list to
list_head") from the net tree and commit
2c10bb9cb3f9cecb71bd2cbb771778136433ebe2 ("wl1271: Fix mac80211
configuration requests during WL1271_STATE_OFF") from the wireless tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/net/wireless/wl12xx/wl1271_main.c
index aa970b7,283d5da..0000000
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@@ -1267,11 -1304,15 +1305,15 @@@ struct wl1271_filter_params
u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN];
};
-static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count,
- struct dev_addr_list *mc_list)
+static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw,
+ struct netdev_hw_addr_list *mc_list)
{
struct wl1271_filter_params *fp;
+ struct netdev_hw_addr *ha;
+ struct wl1271 *wl = hw->priv;
- int i;
+
+ if (unlikely(wl->state == WL1271_STATE_OFF))
+ return 0;
fp = kzalloc(sizeof(*fp), GFP_ATOMIC);
if (!fp) {
next reply other threads:[~2010-04-12 4:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-12 4:05 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-19 0:59 linux-next: manual merge of the wireless tree with the net tree Stephen Rothwell
2011-08-19 1:03 ` John W. Linville
2011-06-23 2:47 Stephen Rothwell
2011-05-19 1:02 Stephen Rothwell
2010-07-21 2:04 Stephen Rothwell
2010-07-09 1:51 Stephen Rothwell
2010-07-09 9:59 ` Luciano Coelho
2010-06-23 2:51 Stephen Rothwell
2010-06-04 1:48 Stephen Rothwell
2010-06-04 6:14 ` Luciano Coelho
2010-02-16 1:01 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=20100412140517.f433690b.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=ext-saravanan.dhanabal@nokia$(echo .)com \
--cc=jpirko@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=luciano.coelho@nokia$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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