path: root/net/can
diff options
authorDavid S. Miller <davem@davemloft.net>2014-01-30 16:48:17 -0800
committerDavid S. Miller <davem@davemloft.net>2014-01-30 16:48:17 -0800
commit65b80cae7a72e94df9335552e1a77a3a8946566c (patch)
tree28617224603f1e162a2cb6014c1dd3cc027c251a /net/can
parent2b6e0ca175fe4a20f21ba82b1e7ccc71029c4dd4 (diff)
parent73615c8669ef1c497c942cae0d5079b95824332a (diff)
Merge tag 'linux-can-fixes-for-3.14-20140129' of git://gitorious.org/linux-can/linux-can
linux-can-fixes-for-3.14-20140129 Marc Kleine-Budde says: ==================== Arnd Bergmann provides a fix for the flexcan driver, enabling compilation on all combinations of big and little endian on ARM and PowerPc. A patch by Ira W. Snyder fixes uninitialized variable warnings in the janz-ican3 driver. Rostislav Lisovy contributes a patch to propagate the SO_PRIORITY of raw sockets to skbs. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
1 files changed, 1 insertions, 0 deletions
diff --git a/net/can/raw.c b/net/can/raw.c
index 07d72d852324..8be757cca2ec 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -715,6 +715,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock,
skb->dev = dev;
skb->sk = sk;
+ skb->priority = sk->sk_priority;
err = can_send(skb, ro->loopback);

Privacy Policy