can: replace can_dlc as variable/element for payload length

[sfrench/cifs-2.6.git] / net / can / j1939 / main.c

diff --git a/net/can/j1939/main.c b/net/can/j1939/main.c
index 137054bff9ec72b4bc4795b3446ff853ae1c6f13..bb914d8b42168243cf43d1e657a298eea97be27f 100644 (file)
--- a/net/can/j1939/main.c
+++ b/net/can/j1939/main.c
@@ -62,7 +62,7 @@ static void j1939_can_recv(struct sk_buff *iskb, void *data)
        skb_pull(skb, J1939_CAN_HDR);
 
        /* fix length, set to dlc, with 8 maximum */
-       skb_trim(skb, min_t(uint8_t, cf->can_dlc, 8));
+       skb_trim(skb, min_t(uint8_t, cf->len, 8));
 
        /* set addr */
        skcb = j1939_skb_to_cb(skb);
@@ -335,7 +335,7 @@ int j1939_send_one(struct j1939_priv *priv, struct sk_buff *skb)
                canid |= skcb->addr.da << 8;
 
        cf->can_id = canid;
-       cf->can_dlc = dlc;
+       cf->len = dlc;
 
        return can_send(skb, 1);