renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-15 16:53:54 +08:00
Code

linux-can-fixes-for-3.14-20140129

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEUEABECAAYFAlLpas0ACgkQjTAFq1RaXHN8KwCeM2I+jaknMl9xJIauEG4FHhwj
 UvoAlRLtN1IlYbnhta5iHmFycdyN158=
 =M6Dq
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
David S. Miller 2014-01-30 16:48:17 -08:00
commit 65b80cae7a
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/can/Kconfig
View File

@ -104,7 +104,7 @@ config CAN_JANZ_ICAN3
config CAN_FLEXCAN config CAN_FLEXCAN
tristate "Support for Freescale FLEXCAN based chips" tristate "Support for Freescale FLEXCAN based chips"
depends on (ARM && CPU_LITTLE_ENDIAN) || PPC depends on ARM || PPC
---help--- ---help---
Say Y here if you want to support for Freescale FlexCAN. Say Y here if you want to support for Freescale FlexCAN.

7
drivers/net/can/flexcan.c
View File

@ -235,9 +235,12 @@ static const struct can_bittiming_const flexcan_bittiming_const = {
}; };
/* /*
* Abstract off the read/write for arm versus ppc. * Abstract off the read/write for arm versus ppc. This
* assumes that PPC uses big-endian registers and everything
* else uses little-endian registers, independent of CPU
* endianess.
*/ */
#if defined(__BIG_ENDIAN) #if defined(CONFIG_PPC)
static inline u32 flexcan_read(void __iomem *addr) static inline u32 flexcan_read(void __iomem *addr)
{ {
return in_be32(addr); return in_be32(addr);

2
drivers/net/can/janz-ican3.c
View File

@ -1312,7 +1312,7 @@ static int ican3_napi(struct napi_struct *napi, int budget)
/* process all communication messages */ /* process all communication messages */
while (true) { while (true) {
struct ican3_msg msg; struct ican3_msg uninitialized_var(msg);
ret = ican3_recv_msg(mod, &msg); ret = ican3_recv_msg(mod, &msg);
if (ret) if (ret)
break; break;

1
net/can/raw.c
View File

@ -715,6 +715,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock,
skb->dev = dev; skb->dev = dev;
skb->sk = sk; skb->sk = sk;
skb->priority = sk->sk_priority;
err = can_send(skb, ro->loopback); err = can_send(skb, ro->loopback);