diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-30 16:48:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-30 16:48:17 -0800 |
| commit | 65b80cae7a72e94df9335552e1a77a3a8946566c (patch) | |
| tree | 28617224603f1e162a2cb6014c1dd3cc027c251a /drivers/net | |
| parent | 2b6e0ca175fe4a20f21ba82b1e7ccc71029c4dd4 (diff) | |
| parent | 73615c8669ef1c497c942cae0d5079b95824332a (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 'drivers/net')
| -rw-r--r-- | drivers/net/can/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/can/flexcan.c | 7 | ||||
| -rw-r--r-- | drivers/net/can/janz-ican3.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig index d447b881bbd..9e7d95dae2c 100644 --- a/drivers/net/can/Kconfig +++ b/drivers/net/can/Kconfig @@ -104,7 +104,7 @@ config CAN_JANZ_ICAN3 config CAN_FLEXCAN tristate "Support for Freescale FLEXCAN based chips" - depends on (ARM && CPU_LITTLE_ENDIAN) || PPC + depends on ARM || PPC ---help--- Say Y here if you want to support for Freescale FlexCAN. diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index aaed97bee47..320bef2dba4 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -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) { return in_be32(addr); diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c index 2124c679068..71594e5676f 100644 --- a/drivers/net/can/janz-ican3.c +++ b/drivers/net/can/janz-ican3.c @@ -1312,7 +1312,7 @@ static int ican3_napi(struct napi_struct *napi, int budget) /* process all communication messages */ while (true) { - struct ican3_msg msg; + struct ican3_msg uninitialized_var(msg); ret = ican3_recv_msg(mod, &msg); if (ret) break; |