Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d4fb27d authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net/ipv4: Move && and || to end of previous line 



On Sun, 2009-11-22 at 16:31 -0800, David Miller wrote:
> It should be of the form:
> 	if (x &&
> 	    y)
> 
> or:
> 	if (x && y)
> 
> Fix patches, rather than complaints, for existing cases where things
> do not follow this pattern are certainly welcome.

Also collapsed some multiple tabs to single space.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6ebfbc06

net/ipv4/inet_lro.c

+18 −18
Original line number Diff line number Diff line
@@ -64,15 +64,15 @@ static int lro_tcp_ip_check(struct iphdr *iph, struct tcphdr *tcph, 
	if (iph->ihl != IPH_LEN_WO_OPTIONS)

		return -1;



	if (tcph->cwr || tcph->ece || tcph->urg || !tcph->ack

	    || tcph->rst || tcph->syn || tcph->fin)

	if (tcph->cwr || tcph->ece || tcph->urg || !tcph->ack ||

	    tcph->rst || tcph->syn || tcph->fin)

		return -1;



	if (INET_ECN_is_ce(ipv4_get_dsfield(iph)))

		return -1;



	if (tcph->doff != TCPH_LEN_WO_OPTIONS

	    && tcph->doff != TCPH_LEN_W_TIMESTAMP)

	if (tcph->doff != TCPH_LEN_WO_OPTIONS &&

	    tcph->doff != TCPH_LEN_W_TIMESTAMP)

		return -1;



	/* check tcp options (only timestamp allowed) */
@@ -262,10 +262,10 @@ static int lro_check_tcp_conn(struct net_lro_desc *lro_desc, 
			      struct iphdr *iph,

			      struct tcphdr *tcph)

{

	if ((lro_desc->iph->saddr != iph->saddr)

	    || (lro_desc->iph->daddr != iph->daddr)

	    || (lro_desc->tcph->source != tcph->source)

	    || (lro_desc->tcph->dest != tcph->dest))

	if ((lro_desc->iph->saddr != iph->saddr) ||

	    (lro_desc->iph->daddr != iph->daddr) ||

	    (lro_desc->tcph->source != tcph->source) ||

	    (lro_desc->tcph->dest != tcph->dest))

		return -1;

	return 0;

}
@@ -339,8 +339,8 @@ static int __lro_proc_skb(struct net_lro_mgr *lro_mgr, struct sk_buff *skb, 
	u64 flags;

	int vlan_hdr_len = 0;



	if (!lro_mgr->get_skb_header

	    || lro_mgr->get_skb_header(skb, (void *)&iph, (void *)&tcph,

	if (!lro_mgr->get_skb_header ||

	    lro_mgr->get_skb_header(skb, (void *)&iph, (void *)&tcph,

				    &flags, priv))

		goto out;
@@ -351,8 +351,8 @@ static int __lro_proc_skb(struct net_lro_mgr *lro_mgr, struct sk_buff *skb, 
	if (!lro_desc)

		goto out;



	if ((skb->protocol == htons(ETH_P_8021Q))

	    && !(lro_mgr->features & LRO_F_EXTRACT_VLAN_ID))

	if ((skb->protocol == htons(ETH_P_8021Q)) &&

	    !(lro_mgr->features & LRO_F_EXTRACT_VLAN_ID))

		vlan_hdr_len = VLAN_HLEN;



	if (!lro_desc->active) { /* start new lro session */
@@ -446,8 +446,8 @@ static struct sk_buff *__lro_proc_segment(struct net_lro_mgr *lro_mgr, 
	int hdr_len = LRO_MAX_PG_HLEN;

	int vlan_hdr_len = 0;



	if (!lro_mgr->get_frag_header

	    || lro_mgr->get_frag_header(frags, (void *)&mac_hdr, (void *)&iph,

	if (!lro_mgr->get_frag_header ||

	    lro_mgr->get_frag_header(frags, (void *)&mac_hdr, (void *)&iph,

				     (void *)&tcph, &flags, priv)) {

		mac_hdr = page_address(frags->page) + frags->page_offset;

		goto out1;
@@ -472,8 +472,8 @@ static struct sk_buff *__lro_proc_segment(struct net_lro_mgr *lro_mgr, 
		if (!skb)

			goto out;



		if ((skb->protocol == htons(ETH_P_8021Q))

		    && !(lro_mgr->features & LRO_F_EXTRACT_VLAN_ID))

		if ((skb->protocol == htons(ETH_P_8021Q)) &&

		    !(lro_mgr->features & LRO_F_EXTRACT_VLAN_ID))

			vlan_hdr_len = VLAN_HLEN;



		iph = (void *)(skb->data + vlan_hdr_len);

net/ipv4/ip_output.c

+4 −2
Original line number Diff line number Diff line
@@ -264,7 +264,9 @@ int ip_mc_output(struct sk_buff *skb) 


		   This check is duplicated in ip_mr_input at the moment.

		 */

		    && ((rt->rt_flags&RTCF_LOCAL) || !(IPCB(skb)->flags&IPSKB_FORWARDED))

		    &&

		    ((rt->rt_flags & RTCF_LOCAL) ||

		     !(IPCB(skb)->flags & IPSKB_FORWARDED))

#endif

		   ) {

			struct sk_buff *newskb = skb_clone(skb, GFP_ATOMIC);

net/ipv4/ipconfig.c

+6 −7
Original line number Diff line number Diff line
@@ -1172,10 +1172,9 @@ static int __init ic_dynamic(void) 
			schedule_timeout_uninterruptible(1);

#ifdef IPCONFIG_DHCP

		/* DHCP isn't done until we get a DHCPACK. */

		if ((ic_got_reply & IC_BOOTP)

		    && (ic_proto_enabled & IC_USE_DHCP)

		    && ic_dhcp_msgtype != DHCPACK)

		{

		if ((ic_got_reply & IC_BOOTP) &&

		    (ic_proto_enabled & IC_USE_DHCP) &&

		    ic_dhcp_msgtype != DHCPACK) {

			ic_got_reply = 0;

			printk(",");

			continue;
@@ -1344,9 +1343,9 @@ static int __init ip_auto_config(void) 
	 */

	if (ic_myaddr == NONE ||

#ifdef CONFIG_ROOT_NFS

	    (root_server_addr == NONE

	     && ic_servaddr == NONE

	     && ROOT_DEV == Root_NFS) ||

	    (root_server_addr == NONE &&

	     ic_servaddr == NONE &&

	     ROOT_DEV == Root_NFS) ||

#endif

	    ic_first_dev->next) {

#ifdef IPCONFIG_DYNAMIC

net/ipv4/route.c

+10 −9
Original line number Diff line number Diff line
@@ -1346,9 +1346,9 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw, 
		return;



	net = dev_net(dev);

	if (new_gw == old_gw || !IN_DEV_RX_REDIRECTS(in_dev)

	    || ipv4_is_multicast(new_gw) || ipv4_is_lbcast(new_gw)

	    || ipv4_is_zeronet(new_gw))

	if (new_gw == old_gw || !IN_DEV_RX_REDIRECTS(in_dev) ||

	    ipv4_is_multicast(new_gw) || ipv4_is_lbcast(new_gw) ||

	    ipv4_is_zeronet(new_gw))

		goto reject_redirect;



	if (!rt_caching(net))
@@ -2311,7 +2311,8 @@ int ip_route_input(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
				ip_hdr(skb)->protocol);

			if (our

#ifdef CONFIG_IP_MROUTE

			    || (!ipv4_is_local_multicast(daddr) &&

				||

			    (!ipv4_is_local_multicast(daddr) &&

			     IN_DEV_MFORWARD(in_dev))

#endif

			   ) {
@@ -2511,8 +2512,8 @@ static int ip_route_output_slow(struct net *net, struct rtable **rp, 
		      of another iface. --ANK

		 */



		if (oldflp->oif == 0

		    && (ipv4_is_multicast(oldflp->fl4_dst) ||

		if (oldflp->oif == 0 &&

		    (ipv4_is_multicast(oldflp->fl4_dst) ||

		     oldflp->fl4_dst == htonl(0xFFFFFFFF))) {

			/* It is equivalent to inet_addr_type(saddr) == RTN_LOCAL */

			dev_out = ip_dev_find(net, oldflp->fl4_src);

net/ipv4/tcp_htcp.c

+5 −5
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ static inline void measure_rtt(struct sock *sk, u32 srtt) 
	if (icsk->icsk_ca_state == TCP_CA_Open) {

		if (ca->maxRTT < ca->minRTT)

			ca->maxRTT = ca->minRTT;

		if (ca->maxRTT < srtt

		    && srtt <= ca->maxRTT + msecs_to_jiffies(20))

		if (ca->maxRTT < srtt &&

		    srtt <= ca->maxRTT + msecs_to_jiffies(20))

			ca->maxRTT = srtt;

	}

}
@@ -123,9 +123,9 @@ static void measure_achieved_throughput(struct sock *sk, u32 pkts_acked, s32 rtt 


	ca->packetcount += pkts_acked;



	if (ca->packetcount >= tp->snd_cwnd - (ca->alpha >> 7 ? : 1)

	    && now - ca->lasttime >= ca->minRTT

	    && ca->minRTT > 0) {

	if (ca->packetcount >= tp->snd_cwnd - (ca->alpha >> 7 ? : 1) &&

	    now - ca->lasttime >= ca->minRTT &&

	    ca->minRTT > 0) {

		__u32 cur_Bi = ca->packetcount * HZ / (now - ca->lasttime);



		if (htcp_ccount(ca) <= 3) {