Re: [PATCH v3 net-next] l2tp: Refactor the codes with existing macros instead of literal number

From: Gao Feng <redacted>

Use PPP_ALLSTATIONS, PPP_UI, and SEND_SHUTDOWN instead of 0xff,
0x03, and 2 separately.

Signed-off-by: Gao Feng <redacted>
---
  v3: Modify the subject;
  v2: Only replace the literal number with macros according to Guillaume's advice
  v1: Inital patch

  net/l2tp/l2tp_ppp.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index d9560aa..65e2fd6 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c

@@ -177,7 +177,7 @@ static int pppol2tp_recv_payload_hook(struct sk_buff *skb)
  	if (!pskb_may_pull(skb, 2))
  		return 1;
  
-	if ((skb->data[0] == 0xff) && (skb->data[1] == 0x03))
+	if ((skb->data[0] == PPP_ALLSTATIONS) && (skb->data[1] == PPP_UI))

  
  	return 0;

@@ -282,7 +282,7 @@ static void pppol2tp_session_sock_put(struct l2tp_session *session)
  static int pppol2tp_sendmsg(struct socket *sock, struct msghdr *m,
  			    size_t total_len)
  {
-	static const unsigned char ppph[2] = { 0xff, 0x03 };
+	static const unsigned char ppph[2] = {PPP_ALLSTATIONS, PPP_UI};

  	struct sock *sk = sock->sk;
  	struct sk_buff *skb;
  	int error;

@@ -369,7 +369,7 @@ error:
   */
  static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
  {
-	static const u8 ppph[2] = { 0xff, 0x03 };
+	static const u8 ppph[2] = {PPP_ALLSTATIONS, PPP_UI};

  	struct sock *sk = (struct sock *) chan->private;
  	struct sock *sk_tun;
  	struct l2tp_session *session;

@@ -440,7 +440,7 @@ static void pppol2tp_session_close(struct l2tp_session *session)
  	BUG_ON(session->magic != L2TP_SESSION_MAGIC);
  
  	if (sock) {
-		inet_shutdown(sock, 2);
+		inet_shutdown(sock, SEND_SHUTDOWN);
  		/* Don't let the session go away before our socket does */
  		l2tp_session_inc_refcount(session);
  	}