hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: gdm72xx: Add space around '&' 

Add space around operator '&'. Problem found using
checkpatch.pl
CHECK: spaces preferred around that '&' (ctx:VxV)

Signed-off-by: Burcin Akalin <brcnakalin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Burcin Akalin 2015-11-01 01:56:48 +03:00 committed by Greg Kroah-Hartman
parent e1fec5395a
commit 24f49745df
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/staging/gdm72xx/gdm_qos.c
View File

@ -143,18 +143,18 @@ static int chk_ipv4_rule(struct gdm_wimax_csr_s *csr, u8 *stream, u8 *port)
{
int i;
if (csr->classifier_rule_en&IPTYPEOFSERVICE) {
if (csr->classifier_rule_en & IPTYPEOFSERVICE) {
if (((stream[1] & csr->ip2s_mask) < csr->ip2s_lo) ||
((stream[1] & csr->ip2s_mask) > csr->ip2s_hi))
return 1;
}
if (csr->classifier_rule_en&PROTOCOL) {
if (csr->classifier_rule_en & PROTOCOL) {
if (stream[9] != csr->protocol)
return 1;
}
if (csr->classifier_rule_en&IPMASKEDSRCADDRESS) {
if (csr->classifier_rule_en & IPMASKEDSRCADDRESS) {
for (i = 0; i < 4; i++) {
if ((stream[12 + i] & csr->ipsrc_addrmask[i]) !=
(csr->ipsrc_addr[i] & csr->ipsrc_addrmask[i]))
@ -162,7 +162,7 @@ static int chk_ipv4_rule(struct gdm_wimax_csr_s *csr, u8 *stream, u8 *port)
}
}
if (csr->classifier_rule_en&IPMASKEDDSTADDRESS) {
if (csr->classifier_rule_en & IPMASKEDDSTADDRESS) {
for (i = 0; i < 4; i++) {
if ((stream[16 + i] & csr->ipdst_addrmask[i]) !=
(csr->ipdst_addr[i] & csr->ipdst_addrmask[i]))
@ -170,14 +170,14 @@ static int chk_ipv4_rule(struct gdm_wimax_csr_s *csr, u8 *stream, u8 *port)
}
}
if (csr->classifier_rule_en&PROTOCOLSRCPORTRANGE) {
i = ((port[0]<<8)&0xff00)+port[1];
if (csr->classifier_rule_en & PROTOCOLSRCPORTRANGE) {
i = ((port[0]<<8) & 0xff00)+port[1];
if ((i < csr->srcport_lo) || (i > csr->srcport_hi))
return 1;
}
if (csr->classifier_rule_en&PROTOCOLDSTPORTRANGE) {
i = ((port[2]<<8)&0xff00)+port[3];
if (csr->classifier_rule_en & PROTOCOLDSTPORTRANGE) {
i = ((port[2]<<8) & 0xff00)+port[3];
if ((i < csr->dstport_lo) || (i > csr->dstport_hi))
return 1;
}
@ -193,7 +193,7 @@ static int get_qos_index(struct nic *nic, u8 *iph, u8 *tcpudph)
if (!iph || !tcpudph)
return -1;
ip_ver = (iph[0]>>4)&0xf;
ip_ver = (iph[0]>>4) & 0xf;
if (ip_ver != 4)
return -1;
@ -342,9 +342,9 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)
if (sub_cmd_evt == QOS_REPORT) {
spin_lock_irqsave(&qcb->qos_lock, flags);
for (i = 0; i < qcb->qos_list_cnt; i++) {
sfid = ((buf[(i*5)+6]<<24)&0xff000000);
sfid += ((buf[(i*5)+7]<<16)&0xff0000);
sfid += ((buf[(i*5)+8]<<8)&0xff00);
sfid = ((buf[(i*5)+6]<<24) & 0xff000000);
sfid += ((buf[(i*5)+7]<<16) & 0xff0000);
sfid += ((buf[(i*5)+8]<<8) & 0xff00);
sfid += (buf[(i*5)+9]);
index = get_csr(qcb, sfid, 0);
if (index == -1) {
@ -363,9 +363,9 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)
/* sub_cmd_evt == QOS_ADD || sub_cmd_evt == QOS_CHANG_DEL */
pos = 6;
sfid = ((buf[pos++]<<24)&0xff000000);
sfid += ((buf[pos++]<<16)&0xff0000);
sfid += ((buf[pos++]<<8)&0xff00);
sfid = ((buf[pos++]<<24) & 0xff000000);
sfid += ((buf[pos++]<<16) & 0xff0000);
sfid += ((buf[pos++]<<8) & 0xff00);
sfid += (buf[pos++]);
index = get_csr(qcb, sfid, 1);
@ -382,7 +382,7 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)
spin_lock_irqsave(&qcb->qos_lock, flags);
qcb->csr[index].sfid = sfid;
qcb->csr[index].classifier_rule_en = ((buf[pos++]<<8)&0xff00);
qcb->csr[index].classifier_rule_en = ((buf[pos++]<<8) & 0xff00);
qcb->csr[index].classifier_rule_en += buf[pos++];
if (qcb->csr[index].classifier_rule_en == 0)
qcb->qos_null_idx = index;
@ -406,13 +406,13 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)
qcb->csr[index].ipdst_addr[1] = buf[pos++];
qcb->csr[index].ipdst_addr[2] = buf[pos++];
qcb->csr[index].ipdst_addr[3] = buf[pos++];
qcb->csr[index].srcport_lo = ((buf[pos++]<<8)&0xff00);
qcb->csr[index].srcport_lo = ((buf[pos++]<<8) & 0xff00);
qcb->csr[index].srcport_lo += buf[pos++];
qcb->csr[index].srcport_hi = ((buf[pos++]<<8)&0xff00);
qcb->csr[index].srcport_hi = ((buf[pos++]<<8) & 0xff00);
qcb->csr[index].srcport_hi += buf[pos++];
qcb->csr[index].dstport_lo = ((buf[pos++]<<8)&0xff00);
qcb->csr[index].dstport_lo = ((buf[pos++]<<8) & 0xff00);
qcb->csr[index].dstport_lo += buf[pos++];
qcb->csr[index].dstport_hi = ((buf[pos++]<<8)&0xff00);
qcb->csr[index].dstport_hi = ((buf[pos++]<<8) & 0xff00);
qcb->csr[index].dstport_hi += buf[pos++];
qcb->qos_limit_size = 254/qcb->qos_list_cnt;