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

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



Not including net/atm/

Compiled tested x86 allyesconfig only
Added a > 80 column line or two, which I ignored.
Existing checkpatch plaints willfully, cheerfully ignored.

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

net/9p/trans_fd.c

+2 −2
Original line number Diff line number Diff line
@@ -633,8 +633,8 @@ static void p9_poll_mux(struct p9_conn *m) 
	if (n & POLLOUT) {

		set_bit(Wpending, &m->wsched);

		P9_DPRINTK(P9_DEBUG_TRANS, "mux %p can write\n", m);

		if ((m->wsize || !list_empty(&m->unsent_req_list))

		    && !test_and_set_bit(Wworksched, &m->wsched)) {

		if ((m->wsize || !list_empty(&m->unsent_req_list)) &&

		    !test_and_set_bit(Wworksched, &m->wsched)) {

			P9_DPRINTK(P9_DEBUG_TRANS, "sched write work %p\n", m);

			queue_work(p9_mux_wq, &m->wq);

		}

net/bluetooth/l2cap.c

+10 −10
Original line number Diff line number Diff line
@@ -1362,8 +1362,8 @@ static int l2cap_ertm_send(struct sock *sk) 
	if (pi->conn_state & L2CAP_CONN_WAIT_F)

		return 0;



	while ((skb = sk->sk_send_head) && (!l2cap_tx_window_full(sk))

			&& !(pi->conn_state & L2CAP_CONN_REMOTE_BUSY)) {

	while ((skb = sk->sk_send_head) && (!l2cap_tx_window_full(sk)) &&

	       !(pi->conn_state & L2CAP_CONN_REMOTE_BUSY)) {

		tx_skb = skb_clone(skb, GFP_ATOMIC);



		if (pi->remote_max_tx &&
@@ -1604,8 +1604,8 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms 
		return -EOPNOTSUPP;



	/* Check outgoing MTU */

	if (sk->sk_type == SOCK_SEQPACKET && pi->mode == L2CAP_MODE_BASIC

			&& len > pi->omtu)

	if (sk->sk_type == SOCK_SEQPACKET && pi->mode == L2CAP_MODE_BASIC &&

	    len > pi->omtu)

		return -EINVAL;



	lock_sock(sk);
@@ -2756,8 +2756,8 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr 
		goto unlock;



	if (l2cap_pi(sk)->conf_state & L2CAP_CONF_INPUT_DONE) {

		if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_NO_FCS_RECV)

				|| l2cap_pi(sk)->fcs != L2CAP_FCS_NONE)

		if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_NO_FCS_RECV) ||

		    l2cap_pi(sk)->fcs != L2CAP_FCS_NONE)

			l2cap_pi(sk)->fcs = L2CAP_FCS_CRC16;



		sk->sk_state = BT_CONNECTED;
@@ -2845,8 +2845,8 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr 
	l2cap_pi(sk)->conf_state |= L2CAP_CONF_INPUT_DONE;



	if (l2cap_pi(sk)->conf_state & L2CAP_CONF_OUTPUT_DONE) {

		if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_NO_FCS_RECV)

				|| l2cap_pi(sk)->fcs != L2CAP_FCS_NONE)

		if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_NO_FCS_RECV) ||

		    l2cap_pi(sk)->fcs != L2CAP_FCS_NONE)

			l2cap_pi(sk)->fcs = L2CAP_FCS_CRC16;



		sk->sk_state = BT_CONNECTED;
@@ -3388,8 +3388,8 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str 
			pi->expected_ack_seq = tx_seq;

			l2cap_drop_acked_frames(sk);



			if ((pi->conn_state & L2CAP_CONN_REMOTE_BUSY)

					&& (pi->unacked_frames > 0))

			if ((pi->conn_state & L2CAP_CONN_REMOTE_BUSY) &&

			    (pi->unacked_frames > 0))

				__mod_retrans_timer();



			l2cap_ertm_send(sk);

net/bridge/br_fdb.c

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ static inline unsigned long hold_time(const struct net_bridge *br) 
static inline int has_expired(const struct net_bridge *br,

				  const struct net_bridge_fdb_entry *fdb)

{

	return !fdb->is_static

		&& time_before_eq(fdb->ageing_timer + hold_time(br), jiffies);

	return !fdb->is_static &&

		time_before_eq(fdb->ageing_timer + hold_time(br), jiffies);

}



static inline int br_mac_hash(const unsigned char *mac)

net/bridge/br_sysfs_br.c

+3 −3
Original line number Diff line number Diff line
@@ -316,9 +316,9 @@ static ssize_t store_group_addr(struct device *d, 
	if (new_addr[5] & ~0xf)

		return -EINVAL;



	if (new_addr[5] == 1 	/* 802.3x Pause address */

	    || new_addr[5] == 2 /* 802.3ad Slow protocols */

	    || new_addr[5] == 3) /* 802.1X PAE address */

	if (new_addr[5] == 1 ||		/* 802.3x Pause address */

	    new_addr[5] == 2 ||		/* 802.3ad Slow protocols */

	    new_addr[5] == 3)		/* 802.1X PAE address */

		return -EINVAL;



	spin_lock_bh(&br->lock);

net/bridge/netfilter/ebt_stp.c

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ ebt_stp_mt(const struct sk_buff *skb, const struct xt_match_param *par) 
	if (memcmp(sp, header, sizeof(header)))

		return false;



	if (info->bitmask & EBT_STP_TYPE

	    && FWINV(info->type != sp->type, EBT_STP_TYPE))

	if (info->bitmask & EBT_STP_TYPE &&

	    FWINV(info->type != sp->type, EBT_STP_TYPE))

		return false;



	if (sp->type == BPDU_TYPE_CONFIG &&