Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[NET] LLC: Fix whitespace errors.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

YOSHIFUJI Hideaki and committed by
David S. Miller
d57b1869 56d6c3d7

+43 -43
+9 -9
net/llc/af_llc.c
··· 67 67 static inline __be16 llc_proto_type(u16 arphrd) 68 68 { 69 69 return arphrd == ARPHRD_IEEE802_TR ? 70 - htons(ETH_P_TR_802_2) : htons(ETH_P_802_2); 70 + htons(ETH_P_TR_802_2) : htons(ETH_P_802_2); 71 71 } 72 72 73 73 /** ··· 114 114 struct llc_sock* llc = llc_sk(sk); 115 115 int rc = 0; 116 116 117 - if (unlikely(llc_data_accept_state(llc->state) || 117 + if (unlikely(llc_data_accept_state(llc->state) || 118 118 llc->remote_busy_flag || 119 119 llc->p_flag)) { 120 120 long timeout = sock_sndtimeo(sk, noblock); ··· 602 602 int rc = -EOPNOTSUPP; 603 603 604 604 dprintk("%s: accepting on %02X\n", __FUNCTION__, 605 - llc_sk(sk)->laddr.lsap); 605 + llc_sk(sk)->laddr.lsap); 606 606 lock_sock(sk); 607 607 if (unlikely(sk->sk_type != SOCK_STREAM)) 608 608 goto out; ··· 617 617 goto out; 618 618 } 619 619 dprintk("%s: got a new connection on %02X\n", __FUNCTION__, 620 - llc_sk(sk)->laddr.lsap); 620 + llc_sk(sk)->laddr.lsap); 621 621 skb = skb_dequeue(&sk->sk_receive_queue); 622 622 rc = -EINVAL; 623 623 if (!skb->sk) ··· 682 682 if (flags & MSG_PEEK) { 683 683 peek_seq = llc->copied_seq; 684 684 seq = &peek_seq; 685 - } 685 + } 686 686 687 687 target = sock_rcvlowat(sk, flags & MSG_WAITALL, len); 688 688 copied = 0; ··· 860 860 goto release; 861 861 skb->dev = llc->dev; 862 862 skb->protocol = llc_proto_type(addr->sllc_arphrd); 863 - skb_reserve(skb, hdrlen); 863 + skb_reserve(skb, hdrlen); 864 864 rc = memcpy_fromiovec(skb_put(skb, copied), msg->msg_iov, copied); 865 865 if (rc) 866 866 goto out; ··· 1116 1116 }; 1117 1117 1118 1118 static char llc_proc_err_msg[] __initdata = 1119 - KERN_CRIT "LLC: Unable to register the proc_fs entries\n"; 1119 + KERN_CRIT "LLC: Unable to register the proc_fs entries\n"; 1120 1120 static char llc_sysctl_err_msg[] __initdata = 1121 - KERN_CRIT "LLC: Unable to register the sysctl entries\n"; 1121 + KERN_CRIT "LLC: Unable to register the sysctl entries\n"; 1122 1122 static char llc_sock_err_msg[] __initdata = 1123 - KERN_CRIT "LLC: Unable to register the network family\n"; 1123 + KERN_CRIT "LLC: Unable to register the network family\n"; 1124 1124 1125 1125 static int __init llc2_init(void) 1126 1126 {
+1 -1
net/llc/llc_conn.c
··· 854 854 llc->n2 = 2; /* max retransmit */ 855 855 llc->k = 2; /* tx win size, will adjust dynam */ 856 856 llc->rw = 128; /* rx win size (opt and equal to 857 - * tx_win of remote LLC) */ 857 + * tx_win of remote LLC) */ 858 858 skb_queue_head_init(&llc->pdu_unack_q); 859 859 sk->sk_backlog_rcv = llc_backlog_rcv; 860 860 }
+4 -4
net/llc/llc_input.c
··· 164 164 sap = llc_sap_find(pdu->dsap); 165 165 if (unlikely(!sap)) {/* unknown SAP */ 166 166 dprintk("%s: llc_sap_find(%02X) failed!\n", __FUNCTION__, 167 - pdu->dsap); 167 + pdu->dsap); 168 168 goto drop; 169 169 } 170 170 /* ··· 173 173 */ 174 174 rcv = rcu_dereference(sap->rcv_func); 175 175 if (rcv) { 176 - struct sk_buff *cskb = skb_clone(skb, GFP_ATOMIC); 177 - if (cskb) 178 - rcv(cskb, dev, pt, orig_dev); 176 + struct sk_buff *cskb = skb_clone(skb, GFP_ATOMIC); 177 + if (cskb) 178 + rcv(cskb, dev, pt, orig_dev); 179 179 } 180 180 dest = llc_pdu_type(skb); 181 181 if (unlikely(!dest || !llc_type_handlers[dest - 1]))
+1 -1
net/llc/llc_output.c
··· 40 40 case ARPHRD_IEEE802_TR: { 41 41 struct net_device *dev = skb->dev; 42 42 struct trh_hdr *trh; 43 - 43 + 44 44 skb->mac.raw = skb_push(skb, sizeof(*trh)); 45 45 trh = tr_hdr(skb); 46 46 trh->ac = AC;
+1 -1
net/llc/llc_pdu.c
··· 39 39 40 40 llc_pdu_decode_pdu_type(skb, &pdu_type); 41 41 pdu = llc_pdu_sn_hdr(skb); 42 - 42 + 43 43 switch (pdu_type) { 44 44 case LLC_PDU_TYPE_I: 45 45 case LLC_PDU_TYPE_S:
+8 -8
net/llc/llc_proc.c
··· 142 142 } 143 143 144 144 static char *llc_conn_state_names[] = { 145 - [LLC_CONN_STATE_ADM] = "adm", 146 - [LLC_CONN_STATE_SETUP] = "setup", 145 + [LLC_CONN_STATE_ADM] = "adm", 146 + [LLC_CONN_STATE_SETUP] = "setup", 147 147 [LLC_CONN_STATE_NORMAL] = "normal", 148 - [LLC_CONN_STATE_BUSY] = "busy", 149 - [LLC_CONN_STATE_REJ] = "rej", 150 - [LLC_CONN_STATE_AWAIT] = "await", 148 + [LLC_CONN_STATE_BUSY] = "busy", 149 + [LLC_CONN_STATE_REJ] = "rej", 150 + [LLC_CONN_STATE_AWAIT] = "await", 151 151 [LLC_CONN_STATE_AWAIT_BUSY] = "await_busy", 152 152 [LLC_CONN_STATE_AWAIT_REJ] = "await_rej", 153 153 [LLC_CONN_STATE_D_CONN] = "d_conn", 154 - [LLC_CONN_STATE_RESET] = "reset", 155 - [LLC_CONN_STATE_ERROR] = "error", 156 - [LLC_CONN_STATE_TEMP] = "temp", 154 + [LLC_CONN_STATE_RESET] = "reset", 155 + [LLC_CONN_STATE_ERROR] = "error", 156 + [LLC_CONN_STATE_TEMP] = "temp", 157 157 }; 158 158 159 159 static int llc_seq_core_show(struct seq_file *seq, void *v)
+1 -1
net/llc/llc_s_st.c
··· 175 175 [LLC_SAP_STATE_INACTIVE - 1] = { 176 176 .curr_state = LLC_SAP_STATE_INACTIVE, 177 177 .transitions = llc_sap_inactive_state_transitions, 178 - }, 178 + }, 179 179 [LLC_SAP_STATE_ACTIVE - 1] = { 180 180 .curr_state = LLC_SAP_STATE_ACTIVE, 181 181 .transitions = llc_sap_active_state_transitions,
+3 -3
net/llc/llc_sap.c
··· 201 201 if (sock_queue_rcv_skb(skb->sk, skb)) 202 202 kfree_skb(skb); 203 203 } 204 - } 204 + } 205 205 kfree_skb(skb); 206 206 } 207 207 ··· 215 215 * This function is called when upper layer wants to send a TEST pdu. 216 216 * Returns 0 for success, 1 otherwise. 217 217 */ 218 - void llc_build_and_send_test_pkt(struct llc_sap *sap, 218 + void llc_build_and_send_test_pkt(struct llc_sap *sap, 219 219 struct sk_buff *skb, u8 *dmac, u8 dsap) 220 220 { 221 221 struct llc_sap_state_ev *ev = llc_sap_ev(skb); ··· 224 224 ev->daddr.lsap = dsap; 225 225 memcpy(ev->saddr.mac, skb->dev->dev_addr, IFHWADDRLEN); 226 226 memcpy(ev->daddr.mac, dmac, IFHWADDRLEN); 227 - 227 + 228 228 ev->type = LLC_SAP_EV_TYPE_PRIM; 229 229 ev->prim = LLC_TEST_PRIM; 230 230 ev->prim_type = LLC_PRIM_TYPE_REQ;
+11 -11
net/llc/llc_station.c
··· 112 112 113 113 static int llc_stat_ev_enable_with_dup_addr_check(struct sk_buff *skb) 114 114 { 115 - struct llc_station_state_ev *ev = llc_station_ev(skb); 116 - 115 + struct llc_station_state_ev *ev = llc_station_ev(skb); 116 + 117 117 return ev->type == LLC_STATION_EV_TYPE_SIMPLE && 118 118 ev->prim_type == 119 - LLC_STATION_EV_ENABLE_WITH_DUP_ADDR_CHECK ? 0 : 1; 119 + LLC_STATION_EV_ENABLE_WITH_DUP_ADDR_CHECK ? 0 : 1; 120 120 } 121 121 122 122 static int llc_stat_ev_enable_without_dup_addr_check(struct sk_buff *skb) 123 123 { 124 - struct llc_station_state_ev *ev = llc_station_ev(skb); 125 - 124 + struct llc_station_state_ev *ev = llc_station_ev(skb); 125 + 126 126 return ev->type == LLC_STATION_EV_TYPE_SIMPLE && 127 127 ev->prim_type == 128 128 LLC_STATION_EV_ENABLE_WITHOUT_DUP_ADDR_CHECK ? 0 : 1; ··· 130 130 131 131 static int llc_stat_ev_ack_tmr_exp_lt_retry_cnt_max_retry(struct sk_buff *skb) 132 132 { 133 - struct llc_station_state_ev *ev = llc_station_ev(skb); 134 - 133 + struct llc_station_state_ev *ev = llc_station_ev(skb); 134 + 135 135 return ev->type == LLC_STATION_EV_TYPE_ACK_TMR && 136 136 llc_main_station.retry_count < 137 137 llc_main_station.maximum_retry ? 0 : 1; ··· 139 139 140 140 static int llc_stat_ev_ack_tmr_exp_eq_retry_cnt_max_retry(struct sk_buff *skb) 141 141 { 142 - struct llc_station_state_ev *ev = llc_station_ev(skb); 143 - 142 + struct llc_station_state_ev *ev = llc_station_ev(skb); 143 + 144 144 return ev->type == LLC_STATION_EV_TYPE_ACK_TMR && 145 145 llc_main_station.retry_count == 146 146 llc_main_station.maximum_retry ? 0 : 1; ··· 148 148 149 149 static int llc_stat_ev_rx_null_dsap_xid_c(struct sk_buff *skb) 150 150 { 151 - struct llc_station_state_ev *ev = llc_station_ev(skb); 151 + struct llc_station_state_ev *ev = llc_station_ev(skb); 152 152 struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb); 153 153 154 154 return ev->type == LLC_STATION_EV_TYPE_PDU && ··· 306 306 llc_pdu_decode_sa(skb, mac_da); 307 307 llc_pdu_decode_ssap(skb, &dsap); 308 308 llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, dsap, LLC_PDU_RSP); 309 - llc_pdu_init_as_test_rsp(nskb, skb); 309 + llc_pdu_init_as_test_rsp(nskb, skb); 310 310 rc = llc_mac_hdr_init(nskb, llc_station_mac_sa, mac_da); 311 311 if (unlikely(rc)) 312 312 goto free;
+4 -4
net/llc/sysctl_net_llc.c
··· 1 1 /* 2 2 * sysctl_net_llc.c: sysctl interface to LLC net subsystem. 3 - * 3 + * 4 4 * Arnaldo Carvalho de Melo <acme@conectiva.com.br> 5 5 */ 6 6 ··· 72 72 .procname = "timeout", 73 73 .mode = 0555, 74 74 .child = llc2_timeout_table, 75 - }, 75 + }, 76 76 { 0 }, 77 77 }; 78 78 ··· 82 82 .procname = "llc2", 83 83 .mode = 0555, 84 84 .child = llc2_dir_timeout_table, 85 - }, 85 + }, 86 86 { 87 87 .ctl_name = NET_LLC_STATION, 88 88 .procname = "station", ··· 98 98 .procname = "llc", 99 99 .mode = 0555, 100 100 .child = llc_table, 101 - }, 101 + }, 102 102 { 0 }, 103 103 }; 104 104