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

net: l2tp: ppp: change PPPOL2TP_MSG_* => L2TP_MSG_*

Signed-off-by: Asbjoern Sloth Toennesen <asbjorn@asbjorn.st>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Asbjørn Sloth Tønnesen and committed by
David S. Miller fba40c63 47c3e778

+27 -27
+27 -27
net/l2tp/l2tp_ppp.c
··· 231 231 if (sk->sk_state & PPPOX_BOUND) { 232 232 struct pppox_sock *po; 233 233 234 - l2tp_dbg(session, PPPOL2TP_MSG_DATA, 234 + l2tp_dbg(session, L2TP_MSG_DATA, 235 235 "%s: recv %d byte data frame, passing to ppp\n", 236 236 session->name, data_len); 237 237 238 238 po = pppox_sk(sk); 239 239 ppp_input(&po->chan, skb); 240 240 } else { 241 - l2tp_dbg(session, PPPOL2TP_MSG_DATA, 241 + l2tp_dbg(session, L2TP_MSG_DATA, 242 242 "%s: recv %d byte data frame, passing to L2TP socket\n", 243 243 session->name, data_len); 244 244 ··· 251 251 return; 252 252 253 253 no_sock: 254 - l2tp_info(session, PPPOL2TP_MSG_DATA, "%s: no socket\n", session->name); 254 + l2tp_info(session, L2TP_MSG_DATA, "%s: no socket\n", session->name); 255 255 kfree_skb(skb); 256 256 } 257 257 ··· 773 773 /* This is how we get the session context from the socket. */ 774 774 sk->sk_user_data = session; 775 775 sk->sk_state = PPPOX_CONNECTED; 776 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: created\n", 776 + l2tp_info(session, L2TP_MSG_CONTROL, "%s: created\n", 777 777 session->name); 778 778 779 779 end: ··· 827 827 ps = l2tp_session_priv(session); 828 828 ps->tunnel_sock = tunnel->sock; 829 829 830 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: created\n", 830 + l2tp_info(session, L2TP_MSG_CONTROL, "%s: created\n", 831 831 session->name); 832 832 833 833 error = 0; ··· 989 989 struct l2tp_tunnel *tunnel = session->tunnel; 990 990 struct pppol2tp_ioc_stats stats; 991 991 992 - l2tp_dbg(session, PPPOL2TP_MSG_CONTROL, 992 + l2tp_dbg(session, L2TP_MSG_CONTROL, 993 993 "%s: pppol2tp_session_ioctl(cmd=%#x, arg=%#lx)\n", 994 994 session->name, cmd, arg); 995 995 ··· 1009 1009 if (copy_to_user((void __user *) arg, &ifr, sizeof(struct ifreq))) 1010 1010 break; 1011 1011 1012 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: get mtu=%d\n", 1012 + l2tp_info(session, L2TP_MSG_CONTROL, "%s: get mtu=%d\n", 1013 1013 session->name, session->mtu); 1014 1014 err = 0; 1015 1015 break; ··· 1025 1025 1026 1026 session->mtu = ifr.ifr_mtu; 1027 1027 1028 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: set mtu=%d\n", 1028 + l2tp_info(session, L2TP_MSG_CONTROL, "%s: set mtu=%d\n", 1029 1029 session->name, session->mtu); 1030 1030 err = 0; 1031 1031 break; ··· 1039 1039 if (put_user(session->mru, (int __user *) arg)) 1040 1040 break; 1041 1041 1042 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: get mru=%d\n", 1042 + l2tp_info(session, L2TP_MSG_CONTROL, "%s: get mru=%d\n", 1043 1043 session->name, session->mru); 1044 1044 err = 0; 1045 1045 break; ··· 1054 1054 break; 1055 1055 1056 1056 session->mru = val; 1057 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: set mru=%d\n", 1057 + l2tp_info(session, L2TP_MSG_CONTROL, "%s: set mru=%d\n", 1058 1058 session->name, session->mru); 1059 1059 err = 0; 1060 1060 break; ··· 1064 1064 if (put_user(ps->flags, (int __user *) arg)) 1065 1065 break; 1066 1066 1067 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: get flags=%d\n", 1067 + l2tp_info(session, L2TP_MSG_CONTROL, "%s: get flags=%d\n", 1068 1068 session->name, ps->flags); 1069 1069 err = 0; 1070 1070 break; ··· 1074 1074 if (get_user(val, (int __user *) arg)) 1075 1075 break; 1076 1076 ps->flags = val; 1077 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: set flags=%d\n", 1077 + l2tp_info(session, L2TP_MSG_CONTROL, "%s: set flags=%d\n", 1078 1078 session->name, ps->flags); 1079 1079 err = 0; 1080 1080 break; ··· 1091 1091 if (copy_to_user((void __user *) arg, &stats, 1092 1092 sizeof(stats))) 1093 1093 break; 1094 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: get L2TP stats\n", 1094 + l2tp_info(session, L2TP_MSG_CONTROL, "%s: get L2TP stats\n", 1095 1095 session->name); 1096 1096 err = 0; 1097 1097 break; ··· 1119 1119 struct sock *sk; 1120 1120 struct pppol2tp_ioc_stats stats; 1121 1121 1122 - l2tp_dbg(tunnel, PPPOL2TP_MSG_CONTROL, 1122 + l2tp_dbg(tunnel, L2TP_MSG_CONTROL, 1123 1123 "%s: pppol2tp_tunnel_ioctl(cmd=%#x, arg=%#lx)\n", 1124 1124 tunnel->name, cmd, arg); 1125 1125 ··· 1155 1155 err = -EFAULT; 1156 1156 break; 1157 1157 } 1158 - l2tp_info(tunnel, PPPOL2TP_MSG_CONTROL, "%s: get L2TP stats\n", 1158 + l2tp_info(tunnel, L2TP_MSG_CONTROL, "%s: get L2TP stats\n", 1159 1159 tunnel->name); 1160 1160 err = 0; 1161 1161 break; ··· 1245 1245 switch (optname) { 1246 1246 case PPPOL2TP_SO_DEBUG: 1247 1247 tunnel->debug = val; 1248 - l2tp_info(tunnel, PPPOL2TP_MSG_CONTROL, "%s: set debug=%x\n", 1248 + l2tp_info(tunnel, L2TP_MSG_CONTROL, "%s: set debug=%x\n", 1249 1249 tunnel->name, tunnel->debug); 1250 1250 break; 1251 1251 ··· 1273 1273 break; 1274 1274 } 1275 1275 session->recv_seq = !!val; 1276 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, 1276 + l2tp_info(session, L2TP_MSG_CONTROL, 1277 1277 "%s: set recv_seq=%d\n", 1278 1278 session->name, session->recv_seq); 1279 1279 break; ··· 1291 1291 PPPOL2TP_L2TP_HDR_SIZE_NOSEQ; 1292 1292 } 1293 1293 l2tp_session_set_header_len(session, session->tunnel->version); 1294 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, 1294 + l2tp_info(session, L2TP_MSG_CONTROL, 1295 1295 "%s: set send_seq=%d\n", 1296 1296 session->name, session->send_seq); 1297 1297 break; ··· 1302 1302 break; 1303 1303 } 1304 1304 session->lns_mode = !!val; 1305 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, 1305 + l2tp_info(session, L2TP_MSG_CONTROL, 1306 1306 "%s: set lns_mode=%d\n", 1307 1307 session->name, session->lns_mode); 1308 1308 break; 1309 1309 1310 1310 case PPPOL2TP_SO_DEBUG: 1311 1311 session->debug = val; 1312 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: set debug=%x\n", 1312 + l2tp_info(session, L2TP_MSG_CONTROL, "%s: set debug=%x\n", 1313 1313 session->name, session->debug); 1314 1314 break; 1315 1315 1316 1316 case PPPOL2TP_SO_REORDERTO: 1317 1317 session->reorder_timeout = msecs_to_jiffies(val); 1318 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, 1318 + l2tp_info(session, L2TP_MSG_CONTROL, 1319 1319 "%s: set reorder_timeout=%d\n", 1320 1320 session->name, session->reorder_timeout); 1321 1321 break; ··· 1396 1396 switch (optname) { 1397 1397 case PPPOL2TP_SO_DEBUG: 1398 1398 *val = tunnel->debug; 1399 - l2tp_info(tunnel, PPPOL2TP_MSG_CONTROL, "%s: get debug=%x\n", 1399 + l2tp_info(tunnel, L2TP_MSG_CONTROL, "%s: get debug=%x\n", 1400 1400 tunnel->name, tunnel->debug); 1401 1401 break; 1402 1402 ··· 1419 1419 switch (optname) { 1420 1420 case PPPOL2TP_SO_RECVSEQ: 1421 1421 *val = session->recv_seq; 1422 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, 1422 + l2tp_info(session, L2TP_MSG_CONTROL, 1423 1423 "%s: get recv_seq=%d\n", session->name, *val); 1424 1424 break; 1425 1425 1426 1426 case PPPOL2TP_SO_SENDSEQ: 1427 1427 *val = session->send_seq; 1428 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, 1428 + l2tp_info(session, L2TP_MSG_CONTROL, 1429 1429 "%s: get send_seq=%d\n", session->name, *val); 1430 1430 break; 1431 1431 1432 1432 case PPPOL2TP_SO_LNSMODE: 1433 1433 *val = session->lns_mode; 1434 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, 1434 + l2tp_info(session, L2TP_MSG_CONTROL, 1435 1435 "%s: get lns_mode=%d\n", session->name, *val); 1436 1436 break; 1437 1437 1438 1438 case PPPOL2TP_SO_DEBUG: 1439 1439 *val = session->debug; 1440 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: get debug=%d\n", 1440 + l2tp_info(session, L2TP_MSG_CONTROL, "%s: get debug=%d\n", 1441 1441 session->name, *val); 1442 1442 break; 1443 1443 1444 1444 case PPPOL2TP_SO_REORDERTO: 1445 1445 *val = (int) jiffies_to_msecs(session->reorder_timeout); 1446 - l2tp_info(session, PPPOL2TP_MSG_CONTROL, 1446 + l2tp_info(session, L2TP_MSG_CONTROL, 1447 1447 "%s: get reorder_timeout=%d\n", session->name, *val); 1448 1448 break; 1449 1449