From f25b5740ea5809fe8061eb4165f57792ea4ecc6a Mon Sep 17 00:00:00 2001 From: Abhilash K V Date: Tue, 23 Aug 2011 03:05:48 +0000 Subject: [PATCH] --- yaml --- r: 263547 b: refs/heads/master c: 6f288cc52f478e6f58d96158e7cd857fedb6d111 h: refs/heads/master i: 263545: d71adfffbfb646c575409ecc9d747ba5399dc2cb 263543: b47a7be846f5ce1eba941448ffb35da0d36e2ed3 v: v3 --- [refs] | 2 +- trunk/drivers/net/can/ti_hecc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6094550724ef..ab7071ec185f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69558eeeaba7d79364bb9ac4743dc1ad209508b7 +refs/heads/master: 6f288cc52f478e6f58d96158e7cd857fedb6d111 diff --git a/trunk/drivers/net/can/ti_hecc.c b/trunk/drivers/net/can/ti_hecc.c index f7bbde9eb2cb..0b19a17d8178 100644 --- a/trunk/drivers/net/can/ti_hecc.c +++ b/trunk/drivers/net/can/ti_hecc.c @@ -503,9 +503,9 @@ static netdev_tx_t ti_hecc_xmit(struct sk_buff *skb, struct net_device *ndev) spin_unlock_irqrestore(&priv->mbx_lock, flags); /* Prepare mailbox for transmission */ + data = cf->can_dlc | (get_tx_head_prio(priv) << 8); if (cf->can_id & CAN_RTR_FLAG) /* Remote transmission request */ data |= HECC_CANMCF_RTR; - data |= get_tx_head_prio(priv) << 8; hecc_write_mbx(priv, mbxno, HECC_CANMCF, data); if (cf->can_id & CAN_EFF_FLAG) /* Extended frame format */