---

yaml
---
r: 204039
b: refs/heads/master
c: cff0d6e
h: refs/heads/master
i:
  204037: 8a704be
  204035: 98cec2f
  204031: a58b2f9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3578b0c8abc7bdb4f02152ce5db7e09d484c6866
+refs/heads/master: cff0d6e6edac7672b3f915bb4fb59f279243b7f9

trunk/include/linux/skbuff.h

@@ -169,6 +169,7 @@ struct skb_shared_hwtstamps {
  * @software:		generate software time stamp
  * @in_progress:	device driver is going to provide
  *			hardware time stamp
+ * @prevent_sk_orphan:	make sk reference available on driver level
  * @flags:		all shared_tx flags
  *
  * These flags are attached to packets as part of the
@@ -178,7 +179,8 @@ union skb_shared_tx {
 	struct {
 		__u8	hardware:1,
 			software:1,
-			in_progress:1;
+			in_progress:1,
+			prevent_sk_orphan:1;
 	};
 	__u8 flags;
 };

trunk/net/can/raw.c

@@ -650,6 +650,10 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock,
 	err = sock_tx_timestamp(msg, sk, skb_tx(skb));
 	if (err < 0)
 		goto free_skb;
+
+	/* to be able to check the received tx sock reference in raw_rcv() */
+	skb_tx(skb)->prevent_sk_orphan = 1;
+
 	skb->dev = dev;
 	skb->sk  = sk;