Coding style fix. Fix too many leading tabs and line length. Signed-off-by: Joash Naidoo <joash.n09@xxxxxxxxx> --- Changes in v3: - Fix flipped condition mistake - move skb NULL check before dereferencing it Changes in v2: - Flip additional nested if conditions and don't reverse the last if statement - Move declarations to start of function - Separate converting __constant_htons to htons to another patch --- drivers/staging/r8188eu/core/rtw_br_ext.c | 69 ++++++++++++----------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_br_ext.c b/drivers/staging/r8188eu/core/rtw_br_ext.c index bca20fe5c..833488dd5 100644 --- a/drivers/staging/r8188eu/core/rtw_br_ext.c +++ b/drivers/staging/r8188eu/core/rtw_br_ext.c @@ -604,39 +604,42 @@ void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb) if (!skb) return; - if (!priv->ethBrExtInfo.dhcp_bcst_disable) { - __be16 protocol = *((__be16 *)(skb->data + 2 * ETH_ALEN)); - - if (protocol == __constant_htons(ETH_P_IP)) { /* IP */ - struct iphdr *iph = (struct iphdr *)(skb->data + ETH_HLEN); - - if (iph->protocol == IPPROTO_UDP) { /* UDP */ - struct udphdr *udph = (struct udphdr *)((size_t)iph + (iph->ihl << 2)); - - if ((udph->source == __constant_htons(CLIENT_PORT)) && - (udph->dest == __constant_htons(SERVER_PORT))) { /* DHCP request */ - struct dhcpMessage *dhcph = - (struct dhcpMessage *)((size_t)udph + sizeof(struct udphdr)); - u32 cookie = be32_to_cpu((__be32)dhcph->cookie); - - if (cookie == DHCP_MAGIC) { /* match magic word */ - if (!(dhcph->flags & htons(BROADCAST_FLAG))) { - /* if not broadcast */ - register int sum = 0; - - /* or BROADCAST flag */ - dhcph->flags |= htons(BROADCAST_FLAG); - /* recalculate checksum */ - sum = ~(udph->check) & 0xffff; - sum += be16_to_cpu(dhcph->flags); - while (sum >> 16) - sum = (sum & 0xffff) + (sum >> 16); - udph->check = ~sum; - } - } - } - } - } + __be16 protocol = *((__be16 *)(skb->data + 2 * ETH_ALEN)); + struct iphdr *iph = (struct iphdr *)(skb->data + ETH_HLEN); + struct udphdr *udph = (struct udphdr *)((size_t)iph + (iph->ihl << 2)); + /* DHCP request */ + struct dhcpMessage *dhcph = + (struct dhcpMessage *)((size_t)udph + sizeof(struct udphdr)); + u32 cookie = be32_to_cpu((__be32)dhcph->cookie); + + if (priv->ethBrExtInfo.dhcp_bcst_disable) + return; + + if (protocol != htons(ETH_P_IP)) /* IP */ + return; + + if (iph->protocol != IPPROTO_UDP) /* UDP */ + return; + + if ((udph->source != __constant_htons(CLIENT_PORT)) || + (udph->dest != __constant_htons(SERVER_PORT))) + return; + + if (cookie != DHCP_MAGIC) /* match magic word */ + return; + + if (!(dhcph->flags & htons(BROADCAST_FLAG))) { + /* if not broadcast */ + register int sum = 0; + + /* or BROADCAST flag */ + dhcph->flags |= htons(BROADCAST_FLAG); + /* recalculate checksum */ + sum = ~(udph->check) & 0xffff; + sum += be16_to_cpu(dhcph->flags); + while (sum >> 16) + sum = (sum & 0xffff) + (sum >> 16); + udph->check = ~sum; } } -- 2.35.1