| 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
| ||
|
Message-ID: <4BD8A6B4.20603@hauke-m.de> Date: Wed, 28 Apr 2010 23:20:52 +0200 From: Hauke Mehrtens <hauke@...ke-m.de> To: David Miller <davem@...emloft.net> CC: linville@...driver.com, linux-wireless@...r.kernel.org, netdev@...r.kernel.org Subject: Re: pull request: wireless-2.6 2010-04-15 Hi David, in your merge in 5c01d5669356e13f0fb468944c1dd4c6a7e978ad you added "int i;" into wl1271_main.c which is unused in that function. This patch fixes the merge problem: Signed-off-by: Hauke Mehrtens <hauke@...ke-m.de> --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c @@ -1311,7 +1311,6 @@ 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; David Miller wrote: > From: "John W. Linville" <linville@...driver.com> > Date: Thu, 15 Apr 2010 16:03:31 -0400 > >> Another fix intended for 2.6.34...without it some firmware wierdness can >> induce the driver into hanging the box... :-( >> >> Please let me know if there are problems! > > Pulled, thanks. > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@...r.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- 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