Skip to content

Commit fba40c6

Browse files
asbjornstdavem330
asbjornst
authored and
davem330
committed
net: l2tp: ppp: change PPPOL2TP_MSG_* => L2TP_MSG_*
Signed-off-by: Asbjoern Sloth Toennesen <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 47c3e77 commit fba40c6

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

‎net/l2tp/l2tp_ppp.c

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -231,14 +231,14 @@ static void pppol2tp_recv(struct l2tp_session *session, struct sk_buff *skb, int
231231
if (sk->sk_state & PPPOX_BOUND) {
232232
struct pppox_sock *po;
233233

234-
l2tp_dbg(session, PPPOL2TP_MSG_DATA,
234+
l2tp_dbg(session, L2TP_MSG_DATA,
235235
"%s: recv %d byte data frame, passing to ppp\n",
236236
session->name, data_len);
237237

238238
po = pppox_sk(sk);
239239
ppp_input(&po->chan, skb);
240240
} else {
241-
l2tp_dbg(session, PPPOL2TP_MSG_DATA,
241+
l2tp_dbg(session, L2TP_MSG_DATA,
242242
"%s: recv %d byte data frame, passing to L2TP socket\n",
243243
session->name, data_len);
244244

@@ -251,7 +251,7 @@ static void pppol2tp_recv(struct l2tp_session *session, struct sk_buff *skb, int
251251
return;
252252

253253
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);
255255
kfree_skb(skb);
256256
}
257257

@@ -773,7 +773,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
773773
/* This is how we get the session context from the socket. */
774774
sk->sk_user_data = session;
775775
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",
777777
session->name);
778778

779779
end:
@@ -827,7 +827,7 @@ static int pppol2tp_session_create(struct net *net, u32 tunnel_id, u32 session_i
827827
ps = l2tp_session_priv(session);
828828
ps->tunnel_sock = tunnel->sock;
829829

830-
l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: created\n",
830+
l2tp_info(session, L2TP_MSG_CONTROL, "%s: created\n",
831831
session->name);
832832

833833
error = 0;
@@ -989,7 +989,7 @@ static int pppol2tp_session_ioctl(struct l2tp_session *session,
989989
struct l2tp_tunnel *tunnel = session->tunnel;
990990
struct pppol2tp_ioc_stats stats;
991991

992-
l2tp_dbg(session, PPPOL2TP_MSG_CONTROL,
992+
l2tp_dbg(session, L2TP_MSG_CONTROL,
993993
"%s: pppol2tp_session_ioctl(cmd=%#x, arg=%#lx)\n",
994994
session->name, cmd, arg);
995995

@@ -1009,7 +1009,7 @@ static int pppol2tp_session_ioctl(struct l2tp_session *session,
10091009
if (copy_to_user((void __user *) arg, &ifr, sizeof(struct ifreq)))
10101010
break;
10111011

1012-
l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: get mtu=%d\n",
1012+
l2tp_info(session, L2TP_MSG_CONTROL, "%s: get mtu=%d\n",
10131013
session->name, session->mtu);
10141014
err = 0;
10151015
break;
@@ -1025,7 +1025,7 @@ static int pppol2tp_session_ioctl(struct l2tp_session *session,
10251025

10261026
session->mtu = ifr.ifr_mtu;
10271027

1028-
l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: set mtu=%d\n",
1028+
l2tp_info(session, L2TP_MSG_CONTROL, "%s: set mtu=%d\n",
10291029
session->name, session->mtu);
10301030
err = 0;
10311031
break;
@@ -1039,7 +1039,7 @@ static int pppol2tp_session_ioctl(struct l2tp_session *session,
10391039
if (put_user(session->mru, (int __user *) arg))
10401040
break;
10411041

1042-
l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: get mru=%d\n",
1042+
l2tp_info(session, L2TP_MSG_CONTROL, "%s: get mru=%d\n",
10431043
session->name, session->mru);
10441044
err = 0;
10451045
break;
@@ -1054,7 +1054,7 @@ static int pppol2tp_session_ioctl(struct l2tp_session *session,
10541054
break;
10551055

10561056
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",
10581058
session->name, session->mru);
10591059
err = 0;
10601060
break;
@@ -1064,7 +1064,7 @@ static int pppol2tp_session_ioctl(struct l2tp_session *session,
10641064
if (put_user(ps->flags, (int __user *) arg))
10651065
break;
10661066

1067-
l2tp_info(session, PPPOL2TP_MSG_CONTROL, "%s: get flags=%d\n",
1067+
l2tp_info(session, L2TP_MSG_CONTROL, "%s: get flags=%d\n",
10681068
session->name, ps->flags);
10691069
err = 0;
10701070
break;
@@ -1074,7 +1074,7 @@ static int pppol2tp_session_ioctl(struct l2tp_session *session,
10741074
if (get_user(val, (int __user *) arg))
10751075
break;
10761076
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",
10781078
session->name, ps->flags);
10791079
err = 0;
10801080
break;
@@ -1091,7 +1091,7 @@ static int pppol2tp_session_ioctl(struct l2tp_session *session,
10911091
if (copy_to_user((void __user *) arg, &stats,
10921092
sizeof(stats)))
10931093
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",
10951095
session->name);
10961096
err = 0;
10971097
break;
@@ -1119,7 +1119,7 @@ static int pppol2tp_tunnel_ioctl(struct l2tp_tunnel *tunnel,
11191119
struct sock *sk;
11201120
struct pppol2tp_ioc_stats stats;
11211121

1122-
l2tp_dbg(tunnel, PPPOL2TP_MSG_CONTROL,
1122+
l2tp_dbg(tunnel, L2TP_MSG_CONTROL,
11231123
"%s: pppol2tp_tunnel_ioctl(cmd=%#x, arg=%#lx)\n",
11241124
tunnel->name, cmd, arg);
11251125

@@ -1155,7 +1155,7 @@ static int pppol2tp_tunnel_ioctl(struct l2tp_tunnel *tunnel,
11551155
err = -EFAULT;
11561156
break;
11571157
}
1158-
l2tp_info(tunnel, PPPOL2TP_MSG_CONTROL, "%s: get L2TP stats\n",
1158+
l2tp_info(tunnel, L2TP_MSG_CONTROL, "%s: get L2TP stats\n",
11591159
tunnel->name);
11601160
err = 0;
11611161
break;
@@ -1245,7 +1245,7 @@ static int pppol2tp_tunnel_setsockopt(struct sock *sk,
12451245
switch (optname) {
12461246
case PPPOL2TP_SO_DEBUG:
12471247
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",
12491249
tunnel->name, tunnel->debug);
12501250
break;
12511251

@@ -1273,7 +1273,7 @@ static int pppol2tp_session_setsockopt(struct sock *sk,
12731273
break;
12741274
}
12751275
session->recv_seq = !!val;
1276-
l2tp_info(session, PPPOL2TP_MSG_CONTROL,
1276+
l2tp_info(session, L2TP_MSG_CONTROL,
12771277
"%s: set recv_seq=%d\n",
12781278
session->name, session->recv_seq);
12791279
break;
@@ -1291,7 +1291,7 @@ static int pppol2tp_session_setsockopt(struct sock *sk,
12911291
PPPOL2TP_L2TP_HDR_SIZE_NOSEQ;
12921292
}
12931293
l2tp_session_set_header_len(session, session->tunnel->version);
1294-
l2tp_info(session, PPPOL2TP_MSG_CONTROL,
1294+
l2tp_info(session, L2TP_MSG_CONTROL,
12951295
"%s: set send_seq=%d\n",
12961296
session->name, session->send_seq);
12971297
break;
@@ -1302,20 +1302,20 @@ static int pppol2tp_session_setsockopt(struct sock *sk,
13021302
break;
13031303
}
13041304
session->lns_mode = !!val;
1305-
l2tp_info(session, PPPOL2TP_MSG_CONTROL,
1305+
l2tp_info(session, L2TP_MSG_CONTROL,
13061306
"%s: set lns_mode=%d\n",
13071307
session->name, session->lns_mode);
13081308
break;
13091309

13101310
case PPPOL2TP_SO_DEBUG:
13111311
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",
13131313
session->name, session->debug);
13141314
break;
13151315

13161316
case PPPOL2TP_SO_REORDERTO:
13171317
session->reorder_timeout = msecs_to_jiffies(val);
1318-
l2tp_info(session, PPPOL2TP_MSG_CONTROL,
1318+
l2tp_info(session, L2TP_MSG_CONTROL,
13191319
"%s: set reorder_timeout=%d\n",
13201320
session->name, session->reorder_timeout);
13211321
break;
@@ -1396,7 +1396,7 @@ static int pppol2tp_tunnel_getsockopt(struct sock *sk,
13961396
switch (optname) {
13971397
case PPPOL2TP_SO_DEBUG:
13981398
*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",
14001400
tunnel->name, tunnel->debug);
14011401
break;
14021402

@@ -1419,31 +1419,31 @@ static int pppol2tp_session_getsockopt(struct sock *sk,
14191419
switch (optname) {
14201420
case PPPOL2TP_SO_RECVSEQ:
14211421
*val = session->recv_seq;
1422-
l2tp_info(session, PPPOL2TP_MSG_CONTROL,
1422+
l2tp_info(session, L2TP_MSG_CONTROL,
14231423
"%s: get recv_seq=%d\n", session->name, *val);
14241424
break;
14251425

14261426
case PPPOL2TP_SO_SENDSEQ:
14271427
*val = session->send_seq;
1428-
l2tp_info(session, PPPOL2TP_MSG_CONTROL,
1428+
l2tp_info(session, L2TP_MSG_CONTROL,
14291429
"%s: get send_seq=%d\n", session->name, *val);
14301430
break;
14311431

14321432
case PPPOL2TP_SO_LNSMODE:
14331433
*val = session->lns_mode;
1434-
l2tp_info(session, PPPOL2TP_MSG_CONTROL,
1434+
l2tp_info(session, L2TP_MSG_CONTROL,
14351435
"%s: get lns_mode=%d\n", session->name, *val);
14361436
break;
14371437

14381438
case PPPOL2TP_SO_DEBUG:
14391439
*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",
14411441
session->name, *val);
14421442
break;
14431443

14441444
case PPPOL2TP_SO_REORDERTO:
14451445
*val = (int) jiffies_to_msecs(session->reorder_timeout);
1446-
l2tp_info(session, PPPOL2TP_MSG_CONTROL,
1446+
l2tp_info(session, L2TP_MSG_CONTROL,
14471447
"%s: get reorder_timeout=%d\n", session->name, *val);
14481448
break;
14491449

0 commit comments

Comments
 (0)