Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b89741a0cc162511b4341c07e17e1bd4c8b4621d

Authored by Allan Stephens
Committed by David S. Miller
1 parent 4934c69a38
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[TIPC]: Cosmetic changes to TIPC connect() code 

This patch fixes TIPC's connect routine to conform to Linux
kernel style norms of indentation, line length, etc.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 72 additions and 71 deletions Side-by-side Diff

... ... @@ -1248,77 +1248,78 @@
1248 1248 static int connect(struct socket *sock, struct sockaddr *dest, int destlen,
1249 1249 int flags)
1250 1250 {
1251   - struct tipc_sock *tsock = tipc_sk(sock->sk);
1252   - struct sockaddr_tipc *dst = (struct sockaddr_tipc *)dest;
1253   - struct msghdr m = {NULL,};
1254   - struct sk_buff *buf;
1255   - struct tipc_msg *msg;
1256   - int res;
  1251 + struct tipc_sock *tsock = tipc_sk(sock->sk);
  1252 + struct sockaddr_tipc *dst = (struct sockaddr_tipc *)dest;
  1253 + struct msghdr m = {NULL,};
  1254 + struct sk_buff *buf;
  1255 + struct tipc_msg *msg;
  1256 + int res;
1257 1257  
1258   - /* For now, TIPC does not allow use of connect() with DGRAM or RDM types */
  1258 + /* For now, TIPC does not allow use of connect() with DGRAM/RDM types */
1259 1259  
1260   - if (sock->state == SS_READY)
1261   - return -EOPNOTSUPP;
  1260 + if (sock->state == SS_READY)
  1261 + return -EOPNOTSUPP;
1262 1262  
1263   - /* For now, TIPC does not support the non-blocking form of connect() */
  1263 + /* For now, TIPC does not support the non-blocking form of connect() */
1264 1264  
1265   - if (flags & O_NONBLOCK)
1266   - return -EWOULDBLOCK;
  1265 + if (flags & O_NONBLOCK)
  1266 + return -EWOULDBLOCK;
1267 1267  
1268   - /* Issue Posix-compliant error code if socket is in the wrong state */
  1268 + /* Issue Posix-compliant error code if socket is in the wrong state */
1269 1269  
1270   - if (sock->state == SS_LISTENING)
1271   - return -EOPNOTSUPP;
1272   - if (sock->state == SS_CONNECTING)
1273   - return -EALREADY;
1274   - if (sock->state != SS_UNCONNECTED)
1275   - return -EISCONN;
  1270 + if (sock->state == SS_LISTENING)
  1271 + return -EOPNOTSUPP;
  1272 + if (sock->state == SS_CONNECTING)
  1273 + return -EALREADY;
  1274 + if (sock->state != SS_UNCONNECTED)
  1275 + return -EISCONN;
1276 1276  
1277   - /*
1278   - * Reject connection attempt using multicast address
1279   - *
1280   - * Note: send_msg() validates the rest of the address fields,
1281   - * so there's no need to do it here
1282   - */
  1277 + /*
  1278 + * Reject connection attempt using multicast address
  1279 + *
  1280 + * Note: send_msg() validates the rest of the address fields,
  1281 + * so there's no need to do it here
  1282 + */
1283 1283  
1284   - if (dst->addrtype == TIPC_ADDR_MCAST)
1285   - return -EINVAL;
  1284 + if (dst->addrtype == TIPC_ADDR_MCAST)
  1285 + return -EINVAL;
1286 1286  
1287   - /* Send a 'SYN-' to destination */
  1287 + /* Send a 'SYN-' to destination */
1288 1288  
1289   - m.msg_name = dest;
1290   - m.msg_namelen = destlen;
1291   - if ((res = send_msg(NULL, sock, &m, 0)) < 0) {
1292   - sock->state = SS_DISCONNECTING;
1293   - return res;
1294   - }
  1289 + m.msg_name = dest;
  1290 + m.msg_namelen = destlen;
  1291 + res = send_msg(NULL, sock, &m, 0);
  1292 + if (res < 0) {
  1293 + sock->state = SS_DISCONNECTING;
  1294 + return res;
  1295 + }
1295 1296  
1296   - if (mutex_lock_interruptible(&tsock->lock))
1297   - return -ERESTARTSYS;
  1297 + if (mutex_lock_interruptible(&tsock->lock))
  1298 + return -ERESTARTSYS;
1298 1299  
1299   - /* Wait for destination's 'ACK' response */
  1300 + /* Wait for destination's 'ACK' response */
1300 1301  
1301   - res = wait_event_interruptible_timeout(*sock->sk->sk_sleep,
1302   - skb_queue_len(&sock->sk->sk_receive_queue),
1303   - sock->sk->sk_rcvtimeo);
1304   - buf = skb_peek(&sock->sk->sk_receive_queue);
1305   - if (res > 0) {
1306   - msg = buf_msg(buf);
1307   - res = auto_connect(sock, tsock, msg);
1308   - if (!res) {
1309   - if (!msg_data_sz(msg))
1310   - advance_queue(tsock);
1311   - }
1312   - } else {
1313   - if (res == 0) {
1314   - res = -ETIMEDOUT;
1315   - } else
1316   - { /* leave "res" unchanged */ }
1317   - sock->state = SS_DISCONNECTING;
1318   - }
  1302 + res = wait_event_interruptible_timeout(*sock->sk->sk_sleep,
  1303 + skb_queue_len(&sock->sk->sk_receive_queue),
  1304 + sock->sk->sk_rcvtimeo);
  1305 + buf = skb_peek(&sock->sk->sk_receive_queue);
  1306 + if (res > 0) {
  1307 + msg = buf_msg(buf);
  1308 + res = auto_connect(sock, tsock, msg);
  1309 + if (!res) {
  1310 + if (!msg_data_sz(msg))
  1311 + advance_queue(tsock);
  1312 + }
  1313 + } else {
  1314 + if (res == 0)
  1315 + res = -ETIMEDOUT;
  1316 + else
  1317 + ; /* leave "res" unchanged */
  1318 + sock->state = SS_DISCONNECTING;
  1319 + }
1319 1320  
1320   - mutex_unlock(&tsock->lock);
1321   - return res;
  1321 + mutex_unlock(&tsock->lock);
  1322 + return res;
1322 1323 }
1323 1324  
1324 1325 /**