* [PATCH 2/2] Staging: RT2860: Fixed multiple errors in rtusb_io.h
@ 2010-10-23 19:12 Neil Munro
2010-11-09 21:23 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Neil Munro @ 2010-10-23 19:12 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Neil Munro
Fixed the errors in rtusb_io.h
Signed-off-by: Neil Munro <neilmunro@gmail.com>
---
drivers/staging/rt2860/rtusb_io.h | 44 +++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/drivers/staging/rt2860/rtusb_io.h b/drivers/staging/rt2860/rtusb_io.h
index 64a2fe4..bbb34d2 100644
--- a/drivers/staging/rt2860/rtusb_io.h
+++ b/drivers/staging/rt2860/rtusb_io.h
@@ -144,42 +144,44 @@ struct rt_cmdq {
/* add Client security information into ASIC WCID table and IVEIV table */
#define RTMP_STA_SECURITY_INFO_ADD(pAd, apidx, KeyID, pEntry) \
- { RTMP_STA_ENTRY_MAC_RESET(pAd, pEntry->Aid); \
- if (pEntry->Aid >= 1) { \
- struct rt_set_asic_wcid_attri SetAsicWcidAttri; \
- SetAsicWcidAttri.WCID = pEntry->Aid; \
- if ((pEntry->AuthMode <= Ndis802_11AuthModeAutoSwitch) && \
- (pEntry->WepStatus == Ndis802_11Encryption1Enabled)) \
- { \
- SetAsicWcidAttri.Cipher = pAd->SharedKey[apidx][KeyID].CipherAlg; \
- } \
- else if (pEntry->AuthMode == Ndis802_11AuthModeWPANone) \
- { \
- SetAsicWcidAttri.Cipher = pAd->SharedKey[apidx][KeyID].CipherAlg; \
- } \
- else SetAsicWcidAttri.Cipher = 0; \
- DBGPRINT(RT_DEBUG_TRACE, ("aid cipher = %ld\n",SetAsicWcidAttri.Cipher)); \
+{
+ RTMP_STA_ENTRY_MAC_RESET(pAd, pEntry->Aid); \
+ if (pEntry->Aid >= 1) { \
+ struct rt_set_asic_wcid_attri SetAsicWcidAttri; \
+ SetAsicWcidAttri.WCID = pEntry->Aid; \
+ if ((pEntry->AuthMode <= Ndis802_11AuthModeAutoSwitch) && \
+ (pEntry->WepStatus == Ndis802_11Encryption1Enabled)) { \
+ SetAsicWcidAttri.Cipher = pAd->SharedKey[apidx][KeyID].CipherAlg; \
+ } \
+ else if (pEntry->AuthMode == Ndis802_11AuthModeWPANone) { \
+ SetAsicWcidAttri.Cipher = pAd->SharedKey[apidx][KeyID].CipherAlg; \
+ } \
+ else
+ SetAsicWcidAttri.Cipher = 0; \
+ DBGPRINT(RT_DEBUG_TRACE, ("aid cipher = %ld\n", SetAsicWcidAttri.Cipher)); \
RTUSBEnqueueInternalCmd(pAd, CMDTHREAD_SET_ASIC_WCID_CIPHER, \
- &SetAsicWcidAttri, sizeof(struct rt_set_asic_wcid_attri)); } }
+ &SetAsicWcidAttri, sizeof(struct rt_set_asic_wcid_attri));
+ }
+}
/* Insert the BA bitmap to ASIC for the Wcid entry */
#define RTMP_ADD_BA_SESSION_TO_ASIC(_pAd, _Aid, _TID) \
- do{ \
+ do { \
struct rt_set_asic_wcid SetAsicWcid; \
SetAsicWcid.WCID = (_Aid); \
SetAsicWcid.SetTid = (0x10000<<(_TID)); \
SetAsicWcid.DeleteTid = 0xffffffff; \
RTUSBEnqueueInternalCmd((_pAd), CMDTHREAD_SET_ASIC_WCID, &SetAsicWcid, sizeof(struct rt_set_asic_wcid)); \
- }while(0)
+ } while (0)
/* Remove the BA bitmap from ASIC for the Wcid entry */
#define RTMP_DEL_BA_SESSION_FROM_ASIC(_pAd, _Wcid, _TID) \
- do{ \
+ do { \
struct rt_set_asic_wcid SetAsicWcid; \
SetAsicWcid.WCID = (_Wcid); \
SetAsicWcid.SetTid = (0xffffffff); \
- SetAsicWcid.DeleteTid = (0x10000<<(_TID) ); \
+ SetAsicWcid.DeleteTid = (0x10000<<(_TID)); \
RTUSBEnqueueInternalCmd((_pAd), CMDTHREAD_SET_ASIC_WCID, &SetAsicWcid, sizeof(struct rt_set_asic_wcid)); \
- }while(0)
+ } while (0)
#endif /* __RTUSB_IO_H__ // */
--
1.7.3.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2/2] Staging: RT2860: Fixed multiple errors in rtusb_io.h
2010-10-23 19:12 [PATCH 2/2] Staging: RT2860: Fixed multiple errors in rtusb_io.h Neil Munro
@ 2010-11-09 21:23 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2010-11-09 21:23 UTC (permalink / raw)
To: Neil Munro; +Cc: gregkh, wfp5p, devel, linux-kernel
On Sat, Oct 23, 2010 at 08:12:17PM +0100, Neil Munro wrote:
> Fixed the errors in rtusb_io.h
"errors"? What type of errors? Do you mean checkpatch.pl
warnings/errors?
>
> Signed-off-by: Neil Munro <neilmunro@gmail.com>
> ---
> drivers/staging/rt2860/rtusb_io.h | 44 +++++++++++++++++++-----------------
> 1 files changed, 23 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/staging/rt2860/rtusb_io.h b/drivers/staging/rt2860/rtusb_io.h
> index 64a2fe4..bbb34d2 100644
> --- a/drivers/staging/rt2860/rtusb_io.h
> +++ b/drivers/staging/rt2860/rtusb_io.h
> @@ -144,42 +144,44 @@ struct rt_cmdq {
>
> /* add Client security information into ASIC WCID table and IVEIV table */
> #define RTMP_STA_SECURITY_INFO_ADD(pAd, apidx, KeyID, pEntry) \
> - { RTMP_STA_ENTRY_MAC_RESET(pAd, pEntry->Aid); \
> - if (pEntry->Aid >= 1) { \
> - struct rt_set_asic_wcid_attri SetAsicWcidAttri; \
> - SetAsicWcidAttri.WCID = pEntry->Aid; \
> - if ((pEntry->AuthMode <= Ndis802_11AuthModeAutoSwitch) && \
> - (pEntry->WepStatus == Ndis802_11Encryption1Enabled)) \
> - { \
> - SetAsicWcidAttri.Cipher = pAd->SharedKey[apidx][KeyID].CipherAlg; \
> - } \
> - else if (pEntry->AuthMode == Ndis802_11AuthModeWPANone) \
> - { \
> - SetAsicWcidAttri.Cipher = pAd->SharedKey[apidx][KeyID].CipherAlg; \
> - } \
> - else SetAsicWcidAttri.Cipher = 0; \
> - DBGPRINT(RT_DEBUG_TRACE, ("aid cipher = %ld\n",SetAsicWcidAttri.Cipher)); \
> +{
> + RTMP_STA_ENTRY_MAC_RESET(pAd, pEntry->Aid); \
> + if (pEntry->Aid >= 1) { \
> + struct rt_set_asic_wcid_attri SetAsicWcidAttri; \
> + SetAsicWcidAttri.WCID = pEntry->Aid; \
> + if ((pEntry->AuthMode <= Ndis802_11AuthModeAutoSwitch) && \
Are you sure this is still all ok? The tabs look pretty wrong and
the ends of the line should be smaller, right?
If you are going to fix up the spacing, please also fix the length of
the lines at the same time, especially when it is so easy to do so.
Care to resend this?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-11-09 21:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-23 19:12 [PATCH 2/2] Staging: RT2860: Fixed multiple errors in rtusb_io.h Neil Munro
2010-11-09 21:23 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.