Skip to content

Commit a248afd

Browse files
davem330davem330
committed
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says: ==================== Here is another batch of updates intended for 3.7... Highlights include an hci_connect re-write in Bluetooth, HCI/LLC layer separation in NFC, removal of the raw pn544 NFC driver, NFC LLCP raw sockets support, improved IBSS auth frame handling in mac80211, full-MAC AP mode notification support in mac80211, a lot of attention paid to brcmfmac, and the usual level of updates to iwlwifi, ath9k, mwifiex, and rt2x00, and various other updates. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents d379142 + c487606 commit a248afd

File tree

148 files changed

+3919
-3413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+3919
-3413
lines changed

‎Documentation/feature-removal-schedule.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -508,18 +508,6 @@ Who: Kees Cook <keescook@chromium.org>
508508

509509
----------------------------
510510

511-
What: Removing the pn544 raw driver.
512-
When: 3.6
513-
Why: With the introduction of the NFC HCI and SHDL kernel layers, pn544.c
514-
is being replaced by pn544_hci.c which is accessible through the netlink
515-
and socket NFC APIs. Moreover, pn544.c is outdated and does not seem to
516-
work properly with the latest Android stacks.
517-
Having 2 drivers for the same hardware is confusing and as such we
518-
should only keep the one following the kernel NFC APIs.
519-
Who: Samuel Ortiz <sameo@linux.intel.com>
520-
521-
----------------------------
522-
523511
What: setitimer accepts user NULL pointer (value)
524512
When: 3.6
525513
Why: setitimer is not returning -EFAULT if user pointer is NULL. This

‎MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4799,6 +4799,7 @@ M: Lauro Ramos Venancio <lauro.venancio@openbossa.org>
47994799
M: Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
48004800
M: Samuel Ortiz <sameo@linux.intel.com>
48014801
L: linux-wireless@vger.kernel.org
4802+
L: linux-nfc@lists.01.org (moderated for non-subscribers)
48024803
S: Maintained
48034804
F: net/nfc/
48044805
F: include/linux/nfc.h

‎drivers/bcma/host_pci.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
273273
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
274274
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
275275
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
276+
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) },
276277
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },
277278
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
278279
{ 0, },

‎drivers/bcma/sprom.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,9 @@ static bool bcma_sprom_onchip_available(struct bcma_bus *bus)
507507
/* for these chips OTP is always available */
508508
present = true;
509509
break;
510+
case BCMA_CHIP_ID_BCM43227:
510511
case BCMA_CHIP_ID_BCM43228:
512+
case BCMA_CHIP_ID_BCM43428:
511513
present = chip_status & BCMA_CC_CHIPST_43228_OTP_PRESENT;
512514
break;
513515
default:

‎drivers/bluetooth/bluecard_cs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ static int bluecard_hci_send_frame(struct sk_buff *skb)
681681
case HCI_SCODATA_PKT:
682682
hdev->stat.sco_tx++;
683683
break;
684-
};
684+
}
685685

686686
/* Prepend skb with frame type */
687687
memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);

‎drivers/bluetooth/btmrvl_sdio.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,8 +600,7 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
600600
exit:
601601
if (ret) {
602602
hdev->stat.err_rx++;
603-
if (skb)
604-
kfree_skb(skb);
603+
kfree_skb(skb);
605604
}
606605

607606
return ret;

‎drivers/bluetooth/btuart_cs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ static int btuart_hci_send_frame(struct sk_buff *skb)
446446
case HCI_SCODATA_PKT:
447447
hdev->stat.sco_tx++;
448448
break;
449-
};
449+
}
450450

451451
/* Prepend skb with frame type */
452452
memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);

‎drivers/bluetooth/btusb.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,12 @@ static struct usb_device_id btusb_table[] = {
9696
{ USB_DEVICE(0x0c10, 0x0000) },
9797

9898
/* Broadcom BCM20702A0 */
99+
{ USB_DEVICE(0x04ca, 0x2003) },
99100
{ USB_DEVICE(0x0489, 0xe042) },
100101
{ USB_DEVICE(0x413c, 0x8197) },
101102

102103
/* Foxconn - Hon Hai */
103-
{ USB_DEVICE(0x0489, 0xe033) },
104+
{ USB_VENDOR_AND_INTERFACE_INFO(0x0489, 0xff, 0x01, 0x01) },
104105

105106
/*Broadcom devices with vendor specific id */
106107
{ USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },

‎drivers/bluetooth/btwilink.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -358,21 +358,7 @@ static struct platform_driver btwilink_driver = {
358358
},
359359
};
360360

361-
/* ------- Module Init/Exit interfaces ------ */
362-
static int __init btwilink_init(void)
363-
{
364-
BT_INFO("Bluetooth Driver for TI WiLink - Version %s", VERSION);
365-
366-
return platform_driver_register(&btwilink_driver);
367-
}
368-
369-
static void __exit btwilink_exit(void)
370-
{
371-
platform_driver_unregister(&btwilink_driver);
372-
}
373-
374-
module_init(btwilink_init);
375-
module_exit(btwilink_exit);
361+
module_platform_driver(btwilink_driver);
376362

377363
/* ------ Module Info ------ */
378364

‎drivers/bluetooth/hci_ldisc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file * file,
531531
default:
532532
err = n_tty_ioctl_helper(tty, file, cmd, arg);
533533
break;
534-
};
534+
}
535535

536536
return err;
537537
}

‎drivers/bluetooth/hci_ll.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ static int ll_recv(struct hci_uart *hu, void *data, int count)
481481
hu->hdev->stat.err_rx++;
482482
ptr++; count--;
483483
continue;
484-
};
484+
}
485485

486486
ptr++; count--;
487487

‎drivers/bluetooth/hci_vhci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ static inline ssize_t vhci_put_user(struct vhci_data *data,
156156
case HCI_SCODATA_PKT:
157157
data->hdev->stat.sco_tx++;
158158
break;
159-
};
159+
}
160160

161161
return total;
162162
}

‎drivers/net/wireless/ath/ath.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ struct ath_common {
159159

160160
bool btcoex_enabled;
161161
bool disable_ani;
162+
bool antenna_diversity;
162163
};
163164

164165
struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,

‎drivers/net/wireless/ath/ath5k/base.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2446,6 +2446,7 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
24462446
hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
24472447
IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
24482448
IEEE80211_HW_SIGNAL_DBM |
2449+
IEEE80211_HW_MFP_CAPABLE |
24492450
IEEE80211_HW_REPORTS_TX_ACK_STATUS;
24502451

24512452
hw->wiphy->interface_modes =

‎drivers/net/wireless/ath/ath5k/mac80211-ops.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,9 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
489489
if (ath5k_modparam_nohwcrypt)
490490
return -EOPNOTSUPP;
491491

492+
if (key->flags & IEEE80211_KEY_FLAG_RX_MGMT)
493+
return -EOPNOTSUPP;
494+
492495
if (vif->type == NL80211_IFTYPE_ADHOC &&
493496
(key->cipher == WLAN_CIPHER_SUITE_TKIP ||
494497
key->cipher == WLAN_CIPHER_SUITE_CCMP) &&
@@ -523,7 +526,7 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
523526
if (key->cipher == WLAN_CIPHER_SUITE_TKIP)
524527
key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
525528
if (key->cipher == WLAN_CIPHER_SUITE_CCMP)
526-
key->flags |= IEEE80211_KEY_FLAG_SW_MGMT;
529+
key->flags |= IEEE80211_KEY_FLAG_SW_MGMT_TX;
527530
ret = 0;
528531
}
529532
break;

‎drivers/net/wireless/ath/ath5k/phy.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1975,11 +1975,13 @@ ath5k_hw_set_spur_mitigation_filter(struct ath5k_hw *ah,
19751975
spur_delta_phase = (spur_offset << 18) / 25;
19761976
spur_freq_sigma_delta = (spur_delta_phase >> 10);
19771977
symbol_width = AR5K_SPUR_SYMBOL_WIDTH_BASE_100Hz / 2;
1978+
break;
19781979
case AR5K_BWMODE_5MHZ:
19791980
/* Both sample_freq and chip_freq are 10MHz (?) */
19801981
spur_delta_phase = (spur_offset << 19) / 25;
19811982
spur_freq_sigma_delta = (spur_delta_phase >> 10);
19821983
symbol_width = AR5K_SPUR_SYMBOL_WIDTH_BASE_100Hz / 4;
1984+
break;
19831985
default:
19841986
if (channel->band == IEEE80211_BAND_5GHZ) {
19851987
/* Both sample_freq and chip_freq are 40MHz */

‎drivers/net/wireless/ath/ath6kl/cfg80211.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,7 +1488,7 @@ static int ath6kl_cfg80211_set_power_mgmt(struct wiphy *wiphy,
14881488
}
14891489

14901490
static struct wireless_dev *ath6kl_cfg80211_add_iface(struct wiphy *wiphy,
1491-
char *name,
1491+
const char *name,
14921492
enum nl80211_iftype type,
14931493
u32 *flags,
14941494
struct vif_params *params)
@@ -3477,7 +3477,7 @@ void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif)
34773477
ar->num_vif--;
34783478
}
34793479

3480-
struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, char *name,
3480+
struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,
34813481
enum nl80211_iftype type,
34823482
u8 fw_vif_idx, u8 nw_type)
34833483
{

‎drivers/net/wireless/ath/ath6kl/cfg80211.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ enum ath6kl_cfg_suspend_mode {
2525
ATH6KL_CFG_SUSPEND_SCHED_SCAN,
2626
};
2727

28-
struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, char *name,
28+
struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,
2929
enum nl80211_iftype type,
3030
u8 fw_vif_idx, u8 nw_type);
3131
void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq,

0 commit comments

Comments
 (0)