diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 19:22:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 19:22:03 +0000 |
| commit | 4fe40b02212fc6ae213fa2082322c3401433a0a3 (patch) | |
| tree | e1bf3b779c1dc9c5337c4442bf720073a3a53415 /net/can/j1939/main.c | |
| parent | Adding upstream version 6.9.7. (diff) | |
| download | linux-4fe40b02212fc6ae213fa2082322c3401433a0a3.tar.xz linux-4fe40b02212fc6ae213fa2082322c3401433a0a3.zip | |
Adding upstream version 6.9.8.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'net/can/j1939/main.c')
| -rw-r--r-- | net/can/j1939/main.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/can/j1939/main.c b/net/can/j1939/main.c index a6fb89fa62..7e8a20f2fc 100644 --- a/net/can/j1939/main.c +++ b/net/can/j1939/main.c @@ -30,10 +30,6 @@ MODULE_ALIAS("can-proto-" __stringify(CAN_J1939)); /* CAN_HDR: #bytes before can_frame data part */ #define J1939_CAN_HDR (offsetof(struct can_frame, data)) -/* CAN_FTR: #bytes beyond data part */ -#define J1939_CAN_FTR (sizeof(struct can_frame) - J1939_CAN_HDR - \ - sizeof(((struct can_frame *)0)->data)) - /* lowest layer */ static void j1939_can_recv(struct sk_buff *iskb, void *data) { @@ -342,7 +338,7 @@ int j1939_send_one(struct j1939_priv *priv, struct sk_buff *skb) memset(cf, 0, J1939_CAN_HDR); /* make it a full can frame again */ - skb_put(skb, J1939_CAN_FTR + (8 - dlc)); + skb_put_zero(skb, 8 - dlc); canid = CAN_EFF_FLAG | (skcb->priority << 26) | |