lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 12 Apr 2010 14:05:17 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: "John W. Linville" <linville@...driver.com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Jiri Pirko <jpirko@...hat.com>, David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>, Saravanan Dhanabal <ext-saravanan.dhanabal@...ia.com>, Luciano Coelho <luciano.coelho@...ia.com> Subject: linux-next: manual merge of the wireless tree with the net tree 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@...b.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) { -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists