Skip to content

Commit 9ce3fab

Browse files
anchaoJacobCrabill
authored andcommitted
[BACKPORT] net/can: remove psock reference from can connect
remove the psock back reference since timestamp has been migrated to can_conn_s Signed-off-by: chao.an <[email protected]>
1 parent 102ee2a commit 9ce3fab

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

net/can/can.h

-4
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ struct can_conn_s
117117
int32_t tx_deadline;
118118
# endif
119119
#endif
120-
121-
#ifdef CONFIG_NET_TIMESTAMP
122-
FAR struct socket *psock; /* Needed to get SO_TIMESTAMP value */
123-
#endif
124120
};
125121

126122
/****************************************************************************

net/can/can_sockif.c

-6
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,6 @@ static int can_setup(FAR struct socket *psock, int protocol)
221221
return -ENOMEM;
222222
}
223223

224-
#ifdef CONFIG_NET_TIMESTAMP
225-
/* Store psock in conn se we can read the SO_TIMESTAMP value */
226-
227-
conn->psock = psock;
228-
#endif
229-
230224
/* Initialize the connection instance */
231225

232226
conn->protocol = (uint8_t)protocol;

0 commit comments

Comments
 (0)