From: Matthias Beyer Date: Tue, 29 Jul 2014 14:52:32 +0000 (+0200) Subject: Staging: bcm: Qos.c: Line length / Whitespace cleanup in EthCSMatchEThTypeSAP() X-Git-Tag: firefly_0821_release~176^2~3491^2~56 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3343b2ec4b4c928546955132b5de07a3aff8d475;p=firefly-linux-kernel-4.4.55.git Staging: bcm: Qos.c: Line length / Whitespace cleanup in EthCSMatchEThTypeSAP() Signed-off-by: Matthias Beyer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index ee50481aa643..f5f85d7d21e6 100644 --- a/drivers/staging/bcm/Qos.c +++ b/drivers/staging/bcm/Qos.c @@ -929,7 +929,9 @@ static bool EthCSMatchDestMACAddress(struct bcm_classifier_rule *pstClassifierRu return TRUE; } -static bool EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRule, struct sk_buff *skb, struct bcm_eth_packet_info *pstEthCsPktInfo) +static bool EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRule, + struct sk_buff *skb, + struct bcm_eth_packet_info *pstEthCsPktInfo) { struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); @@ -937,11 +939,27 @@ static bool EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRule, (pstClassifierRule->au8EthCSEtherType[0] == 0)) return TRUE; - BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s SrcEtherType:%x CLS EtherType[0]:%x\n", __func__, pstEthCsPktInfo->usEtherType, pstClassifierRule->au8EthCSEtherType[0]); + BCM_DEBUG_PRINT(Adapter, + DBG_TYPE_TX, + IPV4_DBG, + DBG_LVL_ALL, + "%s SrcEtherType:%x CLS EtherType[0]:%x\n", + __func__, + pstEthCsPktInfo->usEtherType, + pstClassifierRule->au8EthCSEtherType[0]); if (pstClassifierRule->au8EthCSEtherType[0] == 1) { - BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s CLS EtherType[1]:%x EtherType[2]:%x\n", __func__, pstClassifierRule->au8EthCSEtherType[1], pstClassifierRule->au8EthCSEtherType[2]); - - if (memcmp(&pstEthCsPktInfo->usEtherType, &pstClassifierRule->au8EthCSEtherType[1], 2) == 0) + BCM_DEBUG_PRINT(Adapter, + DBG_TYPE_TX, + IPV4_DBG, + DBG_LVL_ALL, + "%s CLS EtherType[1]:%x EtherType[2]:%x\n", + __func__, + pstClassifierRule->au8EthCSEtherType[1], + pstClassifierRule->au8EthCSEtherType[2]); + + if (memcmp(&pstEthCsPktInfo->usEtherType, + &pstClassifierRule->au8EthCSEtherType[1], + 2) == 0) return TRUE; else return false; @@ -951,8 +969,16 @@ static bool EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRule, if (eEth802LLCFrame != pstEthCsPktInfo->eNwpktEthFrameType) return false; - BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s EthCS DSAP:%x EtherType[2]:%x\n", __func__, pstEthCsPktInfo->ucDSAP, pstClassifierRule->au8EthCSEtherType[2]); - if (pstEthCsPktInfo->ucDSAP == pstClassifierRule->au8EthCSEtherType[2]) + BCM_DEBUG_PRINT(Adapter, + DBG_TYPE_TX, + IPV4_DBG, + DBG_LVL_ALL, + "%s EthCS DSAP:%x EtherType[2]:%x\n", + __func__, + pstEthCsPktInfo->ucDSAP, + pstClassifierRule->au8EthCSEtherType[2]); + if (pstEthCsPktInfo->ucDSAP == + pstClassifierRule->au8EthCSEtherType[2]) return TRUE; else return false;