Skip to content

L
linux
Commit 45a47f0d authored by Mahak Gupta's avatar Mahak Gupta Committed by Greg Kroah-Hartman
Browse files
Options

staging: r8188eu: add space around operators 

Adhere to linux coding style.

Reported by checkpatch:

spaces preferred around that '{operator}'.
Signed-off-by: default avatarMahak Gupta <mahak_g@cs.iitr.ac.in>
Link: https://lore.kernel.org/r/20220413054517.6343-1-mahak_g@cs.iitr.ac.inSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cfb12180
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
drivers/staging/r8188eu/core/rtw_br_ext.c
View file @ 45a47f0d
...@@ -87,19 +87,19 @@ static int skb_pull_and_merge(struct sk_buff *skb, unsigned char *src, int len) ...@@ -87,19 +87,19 @@ static int skb_pull_and_merge(struct sk_buff *skb, unsigned char *src, int len)
int tail_len; int tail_len;
unsigned long end, tail; unsigned long end, tail;
if ((src+len) > skb_tail_pointer(skb) || skb->len < len) if ((src + len) > skb_tail_pointer(skb) || skb->len < len)
return -1; return -1;
tail = (unsigned long)skb_tail_pointer(skb); tail = (unsigned long)skb_tail_pointer(skb);
end = (unsigned long)src+len; end = (unsigned long)src + len;
if (tail < end) if (tail < end)
return -1; return -1;
tail_len = (int)(tail-end); tail_len = (int)(tail - end);
if (tail_len > 0) if (tail_len > 0)
memmove(src, src+len, tail_len); memmove(src, src + len, tail_len);
skb_trim(skb, skb->len-len); skb_trim(skb, skb->len - len);
return 0; return 0;
} }
...@@ -117,7 +117,7 @@ static void __nat25_generate_ipv4_network_addr(unsigned char *networkAddr, ...@@ -117,7 +117,7 @@ static void __nat25_generate_ipv4_network_addr(unsigned char *networkAddr,
memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
networkAddr[0] = NAT25_IPV4; networkAddr[0] = NAT25_IPV4;
memcpy(networkAddr+7, (unsigned char *)ipAddr, 4); memcpy(networkAddr + 7, (unsigned char *)ipAddr, 4);
} }
static void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr, static void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr,
...@@ -126,8 +126,8 @@ static void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr, ...@@ -126,8 +126,8 @@ static void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr,
memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
networkAddr[0] = NAT25_PPPOE; networkAddr[0] = NAT25_PPPOE;
memcpy(networkAddr+1, (unsigned char *)sid, 2); memcpy(networkAddr + 1, (unsigned char *)sid, 2);
memcpy(networkAddr+3, (unsigned char *)ac_mac, 6); memcpy(networkAddr + 3, (unsigned char *)ac_mac, 6);
} }
static void __nat25_generate_ipv6_network_addr(unsigned char *networkAddr, static void __nat25_generate_ipv6_network_addr(unsigned char *networkAddr,
...@@ -136,17 +136,17 @@ static void __nat25_generate_ipv6_network_addr(unsigned char *networkAddr, ...@@ -136,17 +136,17 @@ static void __nat25_generate_ipv6_network_addr(unsigned char *networkAddr,
memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
networkAddr[0] = NAT25_IPV6; networkAddr[0] = NAT25_IPV6;
memcpy(networkAddr+1, (unsigned char *)ipAddr, 16); memcpy(networkAddr + 1, (unsigned char *)ipAddr, 16);
} }
static unsigned char *scan_tlv(unsigned char *data, int len, unsigned char tag, unsigned char len8b) static unsigned char *scan_tlv(unsigned char *data, int len, unsigned char tag, unsigned char len8b)
{ {
while (len > 0) { while (len > 0) {
if (*data == tag && *(data+1) == len8b && len >= len8b*8) if (*data == tag && *(data + 1) == len8b && len >= len8b * 8)
return data+2; return data + 2;
len -= (*(data+1))*8; len -= (*(data + 1)) * 8;
data += (*(data+1))*8; data += (*(data + 1)) * 8;
} }
return NULL; return NULL;
} }
...@@ -158,7 +158,7 @@ static int update_nd_link_layer_addr(unsigned char *data, int len, unsigned char ...@@ -158,7 +158,7 @@ static int update_nd_link_layer_addr(unsigned char *data, int len, unsigned char
if (icmphdr->icmp6_type == NDISC_ROUTER_SOLICITATION) { if (icmphdr->icmp6_type == NDISC_ROUTER_SOLICITATION) {
if (len >= 8) { if (len >= 8) {
mac = scan_tlv(&data[8], len-8, 1, 1); mac = scan_tlv(&data[8], len - 8, 1, 1);
if (mac) { if (mac) {
memcpy(mac, replace_mac, 6); memcpy(mac, replace_mac, 6);
return 1; return 1;
...@@ -166,7 +166,7 @@ static int update_nd_link_layer_addr(unsigned char *data, int len, unsigned char ...@@ -166,7 +166,7 @@ static int update_nd_link_layer_addr(unsigned char *data, int len, unsigned char
} }
} else if (icmphdr->icmp6_type == NDISC_ROUTER_ADVERTISEMENT) { } else if (icmphdr->icmp6_type == NDISC_ROUTER_ADVERTISEMENT) {
if (len >= 16) { if (len >= 16) {
mac = scan_tlv(&data[16], len-16, 1, 1); mac = scan_tlv(&data[16], len - 16, 1, 1);
if (mac) { if (mac) {
memcpy(mac, replace_mac, 6); memcpy(mac, replace_mac, 6);
return 1; return 1;
...@@ -174,7 +174,7 @@ static int update_nd_link_layer_addr(unsigned char *data, int len, unsigned char ...@@ -174,7 +174,7 @@ static int update_nd_link_layer_addr(unsigned char *data, int len, unsigned char
} }
} else if (icmphdr->icmp6_type == NDISC_NEIGHBOUR_SOLICITATION) { } else if (icmphdr->icmp6_type == NDISC_NEIGHBOUR_SOLICITATION) {
if (len >= 24) { if (len >= 24) {
mac = scan_tlv(&data[24], len-24, 1, 1); mac = scan_tlv(&data[24], len - 24, 1, 1);
if (mac) { if (mac) {
memcpy(mac, replace_mac, 6); memcpy(mac, replace_mac, 6);
return 1; return 1;
...@@ -182,7 +182,7 @@ static int update_nd_link_layer_addr(unsigned char *data, int len, unsigned char ...@@ -182,7 +182,7 @@ static int update_nd_link_layer_addr(unsigned char *data, int len, unsigned char
} }
} else if (icmphdr->icmp6_type == NDISC_NEIGHBOUR_ADVERTISEMENT) { } else if (icmphdr->icmp6_type == NDISC_NEIGHBOUR_ADVERTISEMENT) {
if (len >= 24) { if (len >= 24) {
mac = scan_tlv(&data[24], len-24, 2, 1); mac = scan_tlv(&data[24], len - 24, 2, 1);
if (mac) { if (mac) {
memcpy(mac, replace_mac, 6); memcpy(mac, replace_mac, 6);
return 1; return 1;
...@@ -190,7 +190,7 @@ static int update_nd_link_layer_addr(unsigned char *data, int len, unsigned char ...@@ -190,7 +190,7 @@ static int update_nd_link_layer_addr(unsigned char *data, int len, unsigned char
} }
} else if (icmphdr->icmp6_type == NDISC_REDIRECT) { } else if (icmphdr->icmp6_type == NDISC_REDIRECT) {
if (len >= 40) { if (len >= 40) {
mac = scan_tlv(&data[40], len-40, 2, 1); mac = scan_tlv(&data[40], len - 40, 2, 1);
if (mac) { if (mac) {
memcpy(mac, replace_mac, 6); memcpy(mac, replace_mac, 6);
return 1; return 1;
...@@ -397,7 +397,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) ...@@ -397,7 +397,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
tmp = be32_to_cpu(iph->saddr); tmp = be32_to_cpu(iph->saddr);
__nat25_generate_ipv4_network_addr(networkAddr, &tmp); __nat25_generate_ipv4_network_addr(networkAddr, &tmp);
/* record source IP address and , source mac address into db */ /* record source IP address and , source mac address into db */
__nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
return 0; return 0;
default: default:
return -1; return -1;
...@@ -422,7 +422,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) ...@@ -422,7 +422,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
arp_ptr += arp->ar_hln; arp_ptr += arp->ar_hln;
sender = (unsigned int *)arp_ptr; sender = (unsigned int *)arp_ptr;
__nat25_generate_ipv4_network_addr(networkAddr, sender); __nat25_generate_ipv4_network_addr(networkAddr, sender);
__nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
return 0; return 0;
default: default:
return -1; return -1;
...@@ -459,22 +459,22 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) ...@@ -459,22 +459,22 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
sizeof(tag_buf)) sizeof(tag_buf))
return -1; return -1;
memcpy(tag->tag_data+MAGIC_CODE_LEN+RTL_RELAY_TAG_LEN, memcpy(tag->tag_data + MAGIC_CODE_LEN + RTL_RELAY_TAG_LEN,
pOldTag->tag_data, old_tag_len); pOldTag->tag_data, old_tag_len);
if (skb_pull_and_merge(skb, (unsigned char *)pOldTag, TAG_HDR_LEN+old_tag_len) < 0) if (skb_pull_and_merge(skb, (unsigned char *)pOldTag, TAG_HDR_LEN + old_tag_len) < 0)
return -1; return -1;
ph->length = htons(ntohs(ph->length)-TAG_HDR_LEN-old_tag_len); ph->length = htons(ntohs(ph->length) - TAG_HDR_LEN - old_tag_len);
} }
tag->tag_type = PTT_RELAY_SID; tag->tag_type = PTT_RELAY_SID;
tag->tag_len = htons(MAGIC_CODE_LEN+RTL_RELAY_TAG_LEN+old_tag_len); tag->tag_len = htons(MAGIC_CODE_LEN + RTL_RELAY_TAG_LEN + old_tag_len);
/* insert the magic_code+client mac in relay tag */ /* insert the magic_code+client mac in relay tag */
pMagic = (__be16 *)tag->tag_data; pMagic = (__be16 *)tag->tag_data;
*pMagic = htons(MAGIC_CODE); *pMagic = htons(MAGIC_CODE);
memcpy(tag->tag_data+MAGIC_CODE_LEN, skb->data+ETH_ALEN, ETH_ALEN); memcpy(tag->tag_data + MAGIC_CODE_LEN, skb->data + ETH_ALEN, ETH_ALEN);
/* Add relay tag */ /* Add relay tag */
if (__nat25_add_pppoe_tag(skb, tag) < 0) if (__nat25_add_pppoe_tag(skb, tag) < 0)
...@@ -487,7 +487,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) ...@@ -487,7 +487,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
return -2; return -2;
if (priv->pppoe_connection_in_progress == 0) if (priv->pppoe_connection_in_progress == 0)
memcpy(priv->pppoe_addr, skb->data+ETH_ALEN, ETH_ALEN); memcpy(priv->pppoe_addr, skb->data + ETH_ALEN, ETH_ALEN);
priv->pppoe_connection_in_progress = WAIT_TIME_PPPOE; priv->pppoe_connection_in_progress = WAIT_TIME_PPPOE;
} }
...@@ -497,11 +497,11 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) ...@@ -497,11 +497,11 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
} else { /* session phase */ } else { /* session phase */
__nat25_generate_pppoe_network_addr(networkAddr, skb->data, &ph->sid); __nat25_generate_pppoe_network_addr(networkAddr, skb->data, &ph->sid);
__nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
if (!priv->ethBrExtInfo.addPPPoETag && if (!priv->ethBrExtInfo.addPPPoETag &&
priv->pppoe_connection_in_progress && priv->pppoe_connection_in_progress &&
!memcmp(skb->data+ETH_ALEN, priv->pppoe_addr, ETH_ALEN)) !memcmp(skb->data + ETH_ALEN, priv->pppoe_addr, ETH_ALEN))
priv->pppoe_connection_in_progress = 0; priv->pppoe_connection_in_progress = 0;
} }
return 0; return 0;
...@@ -549,7 +549,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) ...@@ -549,7 +549,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
case NAT25_INSERT: case NAT25_INSERT:
if (memcmp(&iph->saddr, "\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0", 16)) { if (memcmp(&iph->saddr, "\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0", 16)) {
__nat25_generate_ipv6_network_addr(networkAddr, (unsigned int *)&iph->saddr); __nat25_generate_ipv6_network_addr(networkAddr, (unsigned int *)&iph->saddr);
__nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
if (iph->nexthdr == IPPROTO_ICMPV6 && if (iph->nexthdr == IPPROTO_ICMPV6 &&
skb->len > (ETH_HLEN + sizeof(*iph) + 4)) { skb->len > (ETH_HLEN + sizeof(*iph) + 4)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7