Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
fix CAN MAINTAINERS SCM tree type
mwifiex: fix crash during simultaneous scan and connect
b43: fix regression in PIO case
ath9k: Fix kernel panic in AR2427 in AP mode
CAN MAINTAINERS update
net: fsl: fec: fix build for mx23-only kernel
sch_qfq: fix overflow in qfq_update_start()
Revert "Bluetooth: Increase HCI reset timeout in hci_dev_do_close"
+32
-15
+5
-6
MAINTAINERS
+5
-6
MAINTAINERS
···
1698
1698
1699
1699
CAN NETWORK LAYER
1700
1700
M: Oliver Hartkopp <socketcan@hartkopp.net>
1701
-
M: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
1702
-
M: Urs Thuermann <urs.thuermann@volkswagen.de>
1703
1701
L: linux-can@vger.kernel.org
1704
-
L: netdev@vger.kernel.org
1705
-
W: http://developer.berlios.de/projects/socketcan/
1702
+
W: http://gitorious.org/linux-can
1703
+
T: git git://gitorious.org/linux-can/linux-can-next.git
1706
1704
S: Maintained
1707
1705
F: net/can/
1708
1706
F: include/linux/can.h
···
1711
1713
1712
1714
CAN NETWORK DRIVERS
1713
1715
M: Wolfgang Grandegger <wg@grandegger.com>
1716
+
M: Marc Kleine-Budde <mkl@pengutronix.de>
1714
1717
L: linux-can@vger.kernel.org
1715
-
L: netdev@vger.kernel.org
1716
-
W: http://developer.berlios.de/projects/socketcan/
1718
+
W: http://gitorious.org/linux-can
1719
+
T: git git://gitorious.org/linux-can/linux-can-next.git
1717
1720
S: Maintained
1718
1721
F: drivers/net/can/
1719
1722
F: include/linux/can/dev.h
+2
-2
drivers/net/ethernet/freescale/Kconfig
+2
-2
drivers/net/ethernet/freescale/Kconfig
···
23
23
config FEC
24
24
bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
25
25
depends on (M523x || M527x || M5272 || M528x || M520x || M532x || \
26
-
ARCH_MXC || ARCH_MXS)
27
-
default ARCH_MXC || ARCH_MXS if ARM
26
+
ARCH_MXC || SOC_IMX28)
27
+
default ARCH_MXC || SOC_IMX28 if ARM
28
28
select PHYLIB
29
29
---help---
30
30
Say Y here if you want to use the built-in 10/100 Fast ethernet
+3
drivers/net/wireless/ath/ath9k/main.c
+3
drivers/net/wireless/ath/ath9k/main.c
+13
-3
drivers/net/wireless/b43/pio.c
+13
-3
drivers/net/wireless/b43/pio.c
···
617
617
const char *err_msg = NULL;
618
618
struct b43_rxhdr_fw4 *rxhdr =
619
619
(struct b43_rxhdr_fw4 *)wl->pio_scratchspace;
620
+
size_t rxhdr_size = sizeof(*rxhdr);
620
621
621
622
BUILD_BUG_ON(sizeof(wl->pio_scratchspace) < sizeof(*rxhdr));
622
-
memset(rxhdr, 0, sizeof(*rxhdr));
623
+
switch (dev->fw.hdr_format) {
624
+
case B43_FW_HDR_410:
625
+
case B43_FW_HDR_351:
626
+
rxhdr_size -= sizeof(rxhdr->format_598) -
627
+
sizeof(rxhdr->format_351);
628
+
break;
629
+
case B43_FW_HDR_598:
630
+
break;
631
+
}
632
+
memset(rxhdr, 0, rxhdr_size);
623
633
624
634
/* Check if we have data and wait for it to get ready. */
625
635
if (q->rev >= 8) {
···
667
657
668
658
/* Get the preamble (RX header) */
669
659
if (q->rev >= 8) {
670
-
b43_block_read(dev, rxhdr, sizeof(*rxhdr),
660
+
b43_block_read(dev, rxhdr, rxhdr_size,
671
661
q->mmio_base + B43_PIO8_RXDATA,
672
662
sizeof(u32));
673
663
} else {
674
-
b43_block_read(dev, rxhdr, sizeof(*rxhdr),
664
+
b43_block_read(dev, rxhdr, rxhdr_size,
675
665
q->mmio_base + B43_PIO_RXDATA,
676
666
sizeof(u16));
677
667
}
+6
-1
drivers/net/wireless/mwifiex/sta_ioctl.c
+6
-1
drivers/net/wireless/mwifiex/sta_ioctl.c
···
55
55
{
56
56
bool cancel_flag = false;
57
57
int status = adapter->cmd_wait_q.status;
58
-
struct cmd_ctrl_node *cmd_queued = adapter->cmd_queued;
58
+
struct cmd_ctrl_node *cmd_queued;
59
59
60
+
if (!adapter->cmd_queued)
61
+
return 0;
62
+
63
+
cmd_queued = adapter->cmd_queued;
60
64
adapter->cmd_queued = NULL;
65
+
61
66
dev_dbg(adapter->dev, "cmd pending\n");
62
67
atomic_inc(&adapter->cmd_pending);
63
68
+1
-1
net/bluetooth/hci_core.c
+1
-1
net/bluetooth/hci_core.c
+2
-2
net/sched/sch_qfq.c
+2
-2
net/sched/sch_qfq.c
···
817
817
static void qfq_update_start(struct qfq_sched *q, struct qfq_class *cl)
818
818
{
819
819
unsigned long mask;
820
-
uint32_t limit, roundedF;
820
+
u64 limit, roundedF;
821
821
int slot_shift = cl->grp->slot_shift;
822
822
823
823
roundedF = qfq_round_down(cl->F, slot_shift);
824
-
limit = qfq_round_down(q->V, slot_shift) + (1UL << slot_shift);
824
+
limit = qfq_round_down(q->V, slot_shift) + (1ULL << slot_shift);
825
825
826
826
if (!qfq_gt(cl->F, q->V) || qfq_gt(roundedF, limit)) {
827
827
/* timestamp was stale */