Return-path: Received: from nbd.name ([46.4.11.11]:41566 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752350Ab0K2Lqq (ORCPT ); Mon, 29 Nov 2010 06:46:46 -0500 Message-ID: <4CF3929E.9020702@openwrt.org> Date: Mon, 29 Nov 2010 12:46:38 +0100 From: Felix Fietkau MIME-Version: 1.0 To: Pavel Machek CC: Sujith , "ath9k-devel@venema.h4ckr.net" , "cko@sysgo.com" , "anl@sysgo.com" , "linux-wireless@vger.kernel.org" , kernel list , "mfa@sysgo.com" , "chunkeey@googlemail.com" , "rudolf.marek@sysgo.com" , Larry Finger Subject: Re: [ath9k-devel] [PATCH] fix endianity on ath9k_htc References: <20101103092431.GA21138@pma.sysgo.com> <20101124081616.GA30595@pma.sysgo.com> <20101124131320.GA2611@pma.sysgo.com> <4CED33E0.5040000@lwfinger.net> <20101126083125.GA28982@pma.sysgo.com> <20101126102026.GA11857@pma.sysgo.com> <20101126112737.GB11857@pma.sysgo.com> <19695.40541.335361.81396@gargle.gargle.HOWL> <20101126123706.GA19755@pma.sysgo.com> <20101129095801.GA28833@pma.sysgo.com> In-Reply-To: <20101129095801.GA28833@pma.sysgo.com> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: On 2010-11-29 10:58 AM, Pavel Machek wrote: > > It seems struct eep_header lacks proper #ifdef BIG_ENDIAN_BITFIELD > markup. eep_4k_header has proper markup, but two fields were swapped. > > Signed-off-by: Pavel Machek > > diff --git a/drivers/net/wireless/ath/ath9k/eeprom.h b/drivers/net/wireless/ath/ath9k/eeprom.h > index 3c99830..022589d 100644 > --- a/drivers/net/wireless/ath/ath9k/eeprom.h > +++ b/drivers/net/wireless/ath/ath9k/eeprom.h > @@ -378,10 +374,14 @@ struct modal_eep_header { > u8 xatten2Margin[AR5416_MAX_CHAINS]; > u8 ob_ch1; > u8 db_ch1; > - u8 useAnt1:1, > - force_xpaon:1, > - local_bias:1, > +#ifndef __BIG_ENDIAN_BITFIELD > + u8 useAnt1:1, force_xpaon:1, local_bias:1, > femBandSelectUsed:1, xlnabufin:1, xlnaisel:2, xlnabufmode:1; > +#else > + u8 xlnabufmode:1, xlnaisel:2, xlnabufin:1, > + femBandSelectUsed:1, local_bias:1, force_xpaon:1, useAnt1:1; > +#endif > + > u8 miscBits; > u16 xpaBiasLvlFreq[3]; > u8 futureModal[6]; I already sent a different fix for this part. See '[PATCH] ath9k_hw: fix more bitfield related endian issues' > @@ -443,7 +444,7 @@ struct modal_eep_4k_header { > u8 antdiv_ctl1:4, ob_4:4; > u8 db1_3:4, db1_2:4; > u8 antdiv_ctl2:4, db1_4:4; > - u8 db2_2:4, db2_3:4; > + u8 db2_3:4, db2_2:4; > u8 reserved:4, db2_4:4; > #else > u8 ob_2:4, ob_3:4; Looks good. - Felix