Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2135357 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge remote-tracking branch 'wireless-next/master' into ath-next

parents d9bc4b9b 5f407acb

Documentation/DocBook/80211.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ 
!Finclude/net/cfg80211.h wdev_priv

!Finclude/net/cfg80211.h ieee80211_iface_limit

!Finclude/net/cfg80211.h ieee80211_iface_combination

!Finclude/net/cfg80211.h cfg80211_check_combinations

      </chapter>

      <chapter>

      <title>Actions and configuration</title>

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -7277,7 +7277,6 @@ F: drivers/video/aty/aty128fb.c 
RALINK RT2X00 WIRELESS LAN DRIVER

P:	rt2x00 project

M:	Ivo van Doorn <IvDoorn@gmail.com>

M:	Gertjan van Wingerde <gwingerde@gmail.com>

M:	Helmut Schaa <helmut.schaa@googlemail.com>

L:	linux-wireless@vger.kernel.org

L:	users@rt2x00.serialmonkey.com (moderated for non-subscribers)

arch/arm/mach-tegra/board-paz00.c

+1 −3
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 


static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {

	.name	= "wifi_rfkill",

	.reset_gpio	= 25, /* PD1 */

	.shutdown_gpio	= 85, /* PK5 */

	.type	= RFKILL_TYPE_WLAN,

};

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x04CA, 0x3004) },

	{ USB_DEVICE(0x04CA, 0x3005) },

	{ USB_DEVICE(0x04CA, 0x3006) },

	{ USB_DEVICE(0x04CA, 0x3007) },

	{ USB_DEVICE(0x04CA, 0x3008) },

	{ USB_DEVICE(0x04CA, 0x300b) },

	{ USB_DEVICE(0x0930, 0x0219) },
@@ -131,6 +132,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btmrvl_drv.h

+3 −1
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ struct btmrvl_device { 
};



struct btmrvl_adapter {

	void *hw_regs_buf;

	u8 *hw_regs;

	u32 int_count;

	struct sk_buff_head tx_queue;

	u8 psmode;
@@ -140,7 +142,7 @@ void btmrvl_interrupt(struct btmrvl_private *priv); 
bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb);

int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb);



int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd);

int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, u8 subcmd);

int btmrvl_send_hscfg_cmd(struct btmrvl_private *priv);

int btmrvl_enable_ps(struct btmrvl_private *priv);

int btmrvl_prepare_command(struct btmrvl_private *priv);