---

yaml
---
r: 341537
b: refs/heads/master
c: bbaf444
h: refs/heads/master
i:
  341535: df38bb9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3117494772d8f906625905c6e203af745ee3530
+refs/heads/master: bbaf444a89dd7dd7effd8ed2f4e4ec64da3cc1da

trunk/MAINTAINERS

@@ -5067,7 +5067,6 @@ F:	net/nfc/
 F:	include/linux/nfc.h
 F:	include/net/nfc/
 F:	drivers/nfc/
-F:	include/linux/platform_data/pn544.h
 
 NFS, SUNRPC, AND LOCKD CLIENTS
 M:	Trond Myklebust <Trond.Myklebust@netapp.com>

trunk/drivers/bluetooth/ath3k.c

@@ -67,7 +67,6 @@ static struct usb_device_id ath3k_table[] = {
 	{ USB_DEVICE(0x13d3, 0x3304) },
 	{ USB_DEVICE(0x0930, 0x0215) },
 	{ USB_DEVICE(0x0489, 0xE03D) },
-	{ USB_DEVICE(0x0489, 0xE027) },
 
 	/* Atheros AR9285 Malbec with sflash firmware */
 	{ USB_DEVICE(0x03F0, 0x311D) },

trunk/drivers/bluetooth/btusb.c

@@ -124,7 +124,6 @@ static struct usb_device_id blacklist_table[] = {
 	{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },
 	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
 	{ USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
-	{ USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE },
 
 	/* Atheros AR9285 Malbec with sflash firmware */
 	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },

trunk/drivers/net/wireless/ath/ath9k/ath9k.h

@@ -461,12 +461,6 @@ void ath9k_queue_reset(struct ath_softc *sc, enum ath_reset_type type);
 /* BTCOEX */
 /**********/
 
-#define ATH_DUMP_BTCOEX(_s, _val)				\
-	do {							\
-		len += snprintf(buf + len, size - len,		\
-				"%20s : %10d\n", _s, (_val));	\
-	} while (0)
-
 enum bt_op_flags {
 	BT_OP_PRIORITY_DETECTED,
 	BT_OP_SCAN,
@@ -500,7 +494,7 @@ void ath9k_btcoex_timer_pause(struct ath_softc *sc);
 void ath9k_btcoex_handle_interrupt(struct ath_softc *sc, u32 status);
 u16 ath9k_btcoex_aggr_limit(struct ath_softc *sc, u32 max_4ms_framelen);
 void ath9k_btcoex_stop_gen_timer(struct ath_softc *sc);
-int ath9k_dump_btcoex(struct ath_softc *sc, u8 *buf, u32 size);
+int ath9k_dump_btcoex(struct ath_softc *sc, u8 *buf, u32 len, u32 size);
 #else
 static inline int ath9k_init_btcoex(struct ath_softc *sc)
 {
@@ -527,7 +521,8 @@ static inline u16 ath9k_btcoex_aggr_limit(struct ath_softc *sc,
 static inline void ath9k_btcoex_stop_gen_timer(struct ath_softc *sc)
 {
 }
-static inline int ath9k_dump_btcoex(struct ath_softc *sc, u8 *buf, u32 size)
+static inline int ath9k_dump_btcoex(struct ath_softc *sc, u8 *buf,
+				    u32 len, u32 size)
 {
 	return 0;
 }

trunk/drivers/net/wireless/ath/ath9k/debug.c

@@ -1599,14 +1599,8 @@ static ssize_t read_file_btcoex(struct file *file, char __user *user_buf,
 	if (buf == NULL)
 		return -ENOMEM;
 
-	if (!sc->sc_ah->common.btcoex_enabled) {
-		len = snprintf(buf, size, "%s\n",
-			       "BTCOEX is disabled");
-		goto exit;
-	}
+	len = ath9k_dump_btcoex(sc, buf, len, size);
 
-	len = ath9k_dump_btcoex(sc, buf, size);
-exit:
 	retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
 	kfree(buf);
 

trunk/drivers/net/wireless/ath/ath9k/gpio.c

@@ -494,31 +494,35 @@ int ath9k_init_btcoex(struct ath_softc *sc)
 	return 0;
 }
 
-static int ath9k_dump_mci_btcoex(struct ath_softc *sc, u8 *buf, u32 size)
+int ath9k_dump_btcoex(struct ath_softc *sc, u8 *buf, u32 len, u32 size)
 {
+#define ATH_DUMP_BTCOEX(_s, _val)                                \
+	do {                                                     \
+		len += snprintf(buf + len, size - len,           \
+				"%20s : %10d\n", _s, (_val));    \
+	} while (0)
+
 	struct ath_btcoex *btcoex = &sc->btcoex;
 	struct ath_mci_profile *mci = &btcoex->mci;
 	struct ath_hw *ah = sc->sc_ah;
 	struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;
-	u32 len = 0;
 	int i;
 
 	ATH_DUMP_BTCOEX("Total BT profiles", NUM_PROF(mci));
-	ATH_DUMP_BTCOEX("MGMT", mci->num_mgmt);
-	ATH_DUMP_BTCOEX("SCO", mci->num_sco);
-	ATH_DUMP_BTCOEX("A2DP", mci->num_a2dp);
-	ATH_DUMP_BTCOEX("HID", mci->num_hid);
-	ATH_DUMP_BTCOEX("PAN", mci->num_pan);
-	ATH_DUMP_BTCOEX("ACL", mci->num_other_acl);
-	ATH_DUMP_BTCOEX("BDR", mci->num_bdr);
+	ATH_DUMP_BTCOEX("Number of MGMT", mci->num_mgmt);
+	ATH_DUMP_BTCOEX("Number of SCO", mci->num_sco);
+	ATH_DUMP_BTCOEX("Number of A2DP", mci->num_a2dp);
+	ATH_DUMP_BTCOEX("Number of HID", mci->num_hid);
+	ATH_DUMP_BTCOEX("Number of PAN", mci->num_pan);
+	ATH_DUMP_BTCOEX("Number of ACL", mci->num_other_acl);
+	ATH_DUMP_BTCOEX("Number of BDR", mci->num_bdr);
 	ATH_DUMP_BTCOEX("Aggr. Limit", mci->aggr_limit);
 	ATH_DUMP_BTCOEX("Stomp Type", btcoex->bt_stomp_type);
 	ATH_DUMP_BTCOEX("BTCoex Period (msec)", btcoex->btcoex_period);
 	ATH_DUMP_BTCOEX("Duty Cycle", btcoex->duty_cycle);
 	ATH_DUMP_BTCOEX("BT Wait time", btcoex->bt_wait_time);
 	ATH_DUMP_BTCOEX("Concurrent Tx", btcoex_hw->mci.concur_tx);
-	ATH_DUMP_BTCOEX("Concurrent RSSI cnt", btcoex->rssi_count);
-
+	ATH_DUMP_BTCOEX("Concur RSSI count", btcoex->rssi_count);
 	len += snprintf(buf + len, size - len, "BT Weights: ");
 	for (i = 0; i < AR9300_NUM_BT_WEIGHTS; i++)
 		len += snprintf(buf + len, size - len, "%08x ",
@@ -533,32 +537,9 @@ static int ath9k_dump_mci_btcoex(struct ath_softc *sc, u8 *buf, u32 size)
 	for (i = 0; i < ATH_BTCOEX_STOMP_MAX; i++)
 		len += snprintf(buf + len, size - len, "%08x ",
 				btcoex_hw->tx_prio[i]);
-
 	len += snprintf(buf + len, size - len, "\n");
+#undef ATH_DUMP_BTCOEX
 
 	return len;
 }
-
-static int ath9k_dump_legacy_btcoex(struct ath_softc *sc, u8 *buf, u32 size)
-{
-
-	struct ath_btcoex *btcoex = &sc->btcoex;
-	u32 len = 0;
-
-	ATH_DUMP_BTCOEX("Stomp Type", btcoex->bt_stomp_type);
-	ATH_DUMP_BTCOEX("BTCoex Period (msec)", btcoex->btcoex_period);
-	ATH_DUMP_BTCOEX("Duty Cycle", btcoex->duty_cycle);
-	ATH_DUMP_BTCOEX("BT Wait time", btcoex->bt_wait_time);
-
-	return len;
-}
-
-int ath9k_dump_btcoex(struct ath_softc *sc, u8 *buf, u32 size)
-{
-	if (ath9k_hw_mci_is_enabled(sc->sc_ah))
-		return ath9k_dump_mci_btcoex(sc, buf, size);
-	else
-		return ath9k_dump_legacy_btcoex(sc, buf, size);
-}
-
 #endif /* CONFIG_ATH9K_BTCOEX_SUPPORT */

trunk/drivers/net/wireless/ath/ath9k/hw.c

@@ -1456,7 +1456,7 @@ static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type)
 	switch (type) {
 	case ATH9K_RESET_POWER_ON:
 		ret = ath9k_hw_set_reset_power_on(ah);
-		if (ret)
+		if (!ret)
 			ah->reset_power_on = true;
 		break;
 	case ATH9K_RESET_WARM:

trunk/drivers/net/wireless/ath/ath9k/xmit.c

@@ -394,7 +394,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 	u16 seq_st = 0, acked_cnt = 0, txfail_cnt = 0, seq_first;
 	u32 ba[WME_BA_BMP_SIZE >> 5];
 	int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0;
-	bool rc_update = true, isba;
+	bool rc_update = true;
 	struct ieee80211_tx_rate rates[4];
 	struct ath_frame_info *fi;
 	int nframes;
@@ -438,17 +438,13 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 	tidno = ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK;
 	tid = ATH_AN_2_TID(an, tidno);
 	seq_first = tid->seq_start;
-	isba = ts->ts_flags & ATH9K_TX_BA;
 
 	/*
 	 * The hardware occasionally sends a tx status for the wrong TID.
 	 * In this case, the BA status cannot be considered valid and all
 	 * subframes need to be retransmitted
-	 *
-	 * Only BlockAcks have a TID and therefore normal Acks cannot be
-	 * checked
 	 */
-	if (isba && tidno != ts->tid)
+	if (tidno != ts->tid)
 		txok = false;
 
 	isaggr = bf_isaggr(bf);

trunk/drivers/net/wireless/brcm80211/Kconfig

@@ -55,17 +55,6 @@ config BRCMFMAC_USB
 	  IEEE802.11n embedded FullMAC WLAN driver. Say Y if you want to
 	  use the driver for an USB wireless card.
 
-config BRCM_TRACING
-	bool "Broadcom device tracing"
-	depends on BRCMSMAC || BRCMFMAC
-	---help---
-	  If you say Y here, the Broadcom wireless drivers will register
-	  with ftrace to dump event information into the trace ringbuffer.
-	  Tracing can be enabled at runtime to aid in debugging wireless
-	  issues. This option adds a small amount of overhead when tracing
-	  is disabled. If unsure, say Y to allow developers to better help
-	  you when wireless problems occur.
-
 config BRCMDBG
 	bool "Broadcom driver debug functions"
 	depends on BRCMSMAC || BRCMFMAC

trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c

@@ -494,9 +494,6 @@ void brcmf_fweh_process_event(struct brcmf_pub *drvr,
 		alloc_flag = GFP_ATOMIC;
 
 	event = kzalloc(sizeof(*event) + datalen, alloc_flag);
-	if (!event)
-		return;
-
 	event->code = code;
 	event->ifidx = *ifidx;
 

trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c

@@ -18,7 +18,6 @@
 #include <linux/module.h>
 #include <linux/firmware.h>
 #include <linux/usb.h>
-#include <linux/vmalloc.h>
 
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>

trunk/drivers/net/wireless/brcm80211/brcmsmac/Makefile

@@ -40,8 +40,7 @@ BRCMSMAC_OFILES := \
 	phy/phytbl_n.o \
 	phy/phy_qmath.o \
 	dma.o \
-	brcms_trace_events.o \
-	debug.o
+	brcms_trace_events.o
 
 MODULEPFX := brcmsmac