diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-31 01:48:17 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-31 01:48:17 +0100 |
| commit | 65b80cae7a72e94df9335552e1a77a3a8946566c (patch) | |
| tree | 28617224603f1e162a2cb6014c1dd3cc027c251a /net/can | |
| parent | e100: Fix "disabling already-disabled device" warning (diff) | |
| parent | can: janz-ican3: fix uninitialized variable warnings (diff) | |
| download | linux-65b80cae7a72e94df9335552e1a77a3a8946566c.tar.xz linux-65b80cae7a72e94df9335552e1a77a3a8946566c.zip | |
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')
| -rw-r--r-- | net/can/raw.c | 1 |
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); |