netdev - Re: linux-next: manual merge of the wireless-next tree with the net-next tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Fri, 13 Apr 2012 12:51:41 +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,
	Johannes Berg <johannes.berg@...el.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Meenakshi Venkataraman <meenakshi.venkataraman@...el.com>
Subject: Re: linux-next: manual merge of the wireless-next tree with the
 net-next tree

Hi John,

On Fri, 13 Apr 2012 12:30:55 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> @@@ -609,10 -605,9 +612,10 @@@
>   			inst_size = img->sec[IWL_UCODE_SECTION_INST].len;
>   			data_size = img->sec[IWL_UCODE_SECTION_DATA].len;
>   		}
> - 		if (nla_put_u32(skb, IWL_TM_ATTR_FW_TYPE, priv->shrd->ucode_type) ||
>  -		NLA_PUT_U32(skb, IWL_TM_ATTR_FW_TYPE, priv->cur_ucode);
>  -		NLA_PUT_U32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size);
>  -		NLA_PUT_U32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size);
> ++		if (nla_put_u32(skb, IWL_TM_ATTR_FW_TYPE, priv->ucode_type) ||
                                                                ^^^^^^^^^^
That should have been "cur_ucode", of course :-(

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped