Patched in Tegra support.

1 files changed, 4 insertions, 9 deletions

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index a306bc66000..5f03e4ea65b 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -232,7 +232,7 @@ static int x25_device_event(struct notifier_block *this, unsigned long event,
                 return NOTIFY_DONE;
 
         if (dev->type == ARPHRD_X25
-#if IS_ENABLED(CONFIG_LLC)
+#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)
          || dev->type == ARPHRD_ETHER
 #endif
          ) {
@@ -1261,19 +1261,14 @@ static int x25_recvmsg(struct kiocb *iocb, struct socket *sock,
         struct x25_sock *x25 = x25_sk(sk);
         struct sockaddr_x25 *sx25 = (struct sockaddr_x25 *)msg->msg_name;
         size_t copied;
-        int qbit, header_len;
+        int qbit, header_len = x25->neighbour->extended ?
+                X25_EXT_MIN_LEN : X25_STD_MIN_LEN;
+
         struct sk_buff *skb;
         unsigned char *asmptr;
         int rc = -ENOTCONN;
 
         lock_sock(sk);
-
-        if (x25->neighbour == NULL)
-                goto out;
-
-        header_len = x25->neighbour->extended ?
-                X25_EXT_MIN_LEN : X25_STD_MIN_LEN;
-
         /*
          * This works for seqpacket too. The receiver has ordered the queue for
          * us! We do one quick check first though