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

Commit f435d9ee authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
parents 5ee49376 09f921f8

Documentation/DocBook/80211.tmpl

+68 −2
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ 
!Finclude/net/cfg80211.h cfg80211_rx_mgmt

!Finclude/net/cfg80211.h cfg80211_mgmt_tx_status

!Finclude/net/cfg80211.h cfg80211_cqm_rssi_notify

!Finclude/net/cfg80211.h cfg80211_cqm_pktloss_notify

!Finclude/net/cfg80211.h cfg80211_michael_mic_failure

      </chapter>

      <chapter>
@@ -332,10 +333,16 @@ 
          <title>functions/definitions</title>

!Finclude/net/mac80211.h ieee80211_rx_status

!Finclude/net/mac80211.h mac80211_rx_flags

!Finclude/net/mac80211.h mac80211_tx_control_flags

!Finclude/net/mac80211.h mac80211_rate_control_flags

!Finclude/net/mac80211.h ieee80211_tx_rate

!Finclude/net/mac80211.h ieee80211_tx_info

!Finclude/net/mac80211.h ieee80211_tx_info_clear_status

!Finclude/net/mac80211.h ieee80211_rx

!Finclude/net/mac80211.h ieee80211_rx_ni

!Finclude/net/mac80211.h ieee80211_rx_irqsafe

!Finclude/net/mac80211.h ieee80211_tx_status

!Finclude/net/mac80211.h ieee80211_tx_status_ni

!Finclude/net/mac80211.h ieee80211_tx_status_irqsafe

!Finclude/net/mac80211.h ieee80211_rts_get

!Finclude/net/mac80211.h ieee80211_rts_duration
@@ -346,6 +353,7 @@ 
!Finclude/net/mac80211.h ieee80211_stop_queue

!Finclude/net/mac80211.h ieee80211_wake_queues

!Finclude/net/mac80211.h ieee80211_stop_queues

!Finclude/net/mac80211.h ieee80211_queue_stopped

        </sect1>

      </chapter>
@@ -354,6 +362,13 @@ 
!Pinclude/net/mac80211.h Frame filtering

!Finclude/net/mac80211.h ieee80211_filter_flags

      </chapter>



      <chapter id="workqueue">

        <title>The mac80211 workqueue</title>

!Pinclude/net/mac80211.h mac80211 workqueue

!Finclude/net/mac80211.h ieee80211_queue_work

!Finclude/net/mac80211.h ieee80211_queue_delayed_work

      </chapter>

    </part>



    <part id="advanced">
@@ -374,6 +389,9 @@ 
!Finclude/net/mac80211.h set_key_cmd

!Finclude/net/mac80211.h ieee80211_key_conf

!Finclude/net/mac80211.h ieee80211_key_flags

!Finclude/net/mac80211.h ieee80211_tkip_key_type

!Finclude/net/mac80211.h ieee80211_get_tkip_key

!Finclude/net/mac80211.h ieee80211_key_removed

      </chapter>



      <chapter id="powersave">
@@ -417,6 +435,18 @@ 
          supported by mac80211, add notes about supporting hw crypto

          with it.

        </para>

!Finclude/net/mac80211.h ieee80211_iterate_active_interfaces

!Finclude/net/mac80211.h ieee80211_iterate_active_interfaces_atomic

      </chapter>



      <chapter id="station-handling">

        <title>Station handling</title>

        <para>TODO</para>

!Finclude/net/mac80211.h ieee80211_sta

!Finclude/net/mac80211.h sta_notify_cmd

!Finclude/net/mac80211.h ieee80211_find_sta

!Finclude/net/mac80211.h ieee80211_find_sta_by_ifaddr

!Finclude/net/mac80211.h ieee80211_sta_block_awake

      </chapter>



      <chapter id="hardware-scan-offload">
@@ -424,6 +454,28 @@ 
        <para>TBD</para>

!Finclude/net/mac80211.h ieee80211_scan_completed

      </chapter>



      <chapter id="aggregation">

        <title>Aggregation</title>

        <sect1>

          <title>TX A-MPDU aggregation</title>

!Pnet/mac80211/agg-tx.c TX A-MPDU aggregation

!Cnet/mac80211/agg-tx.c

        </sect1>

        <sect1>

          <title>RX A-MPDU aggregation</title>

!Pnet/mac80211/agg-rx.c RX A-MPDU aggregation

!Cnet/mac80211/agg-rx.c

        </sect1>

!Finclude/net/mac80211.h ieee80211_ampdu_mlme_action

      </chapter>



      <chapter id="smps">

        <title>Spatial Multiplexing Powersave (SMPS)</title>

!Pinclude/net/mac80211.h Spatial multiplexing power save

!Finclude/net/mac80211.h ieee80211_request_smps

!Finclude/net/mac80211.h ieee80211_smps_mode

      </chapter>

    </part>



    <part id="rate-control">
@@ -435,9 +487,16 @@ 
         interface and how it relates to mac80211 and drivers.

        </para>

      </partintro>

      <chapter id="dummy">

        <title>dummy chapter</title>

      <chapter id="ratecontrol-api">

        <title>Rate Control API</title>

        <para>TBD</para>

!Finclude/net/mac80211.h ieee80211_start_tx_ba_session

!Finclude/net/mac80211.h ieee80211_start_tx_ba_cb_irqsafe

!Finclude/net/mac80211.h ieee80211_stop_tx_ba_session

!Finclude/net/mac80211.h ieee80211_stop_tx_ba_cb_irqsafe

!Finclude/net/mac80211.h rate_control_changed

!Finclude/net/mac80211.h ieee80211_tx_rate_control

!Finclude/net/mac80211.h rate_control_send_low

      </chapter>

    </part>
@@ -485,6 +544,13 @@ 
        </sect1>

      </chapter>



      <chapter id="aggregation-internals">

        <title>Aggregation</title>

!Fnet/mac80211/sta_info.h sta_ampdu_mlme

!Fnet/mac80211/sta_info.h tid_ampdu_tx

!Fnet/mac80211/sta_info.h tid_ampdu_rx

      </chapter>



      <chapter id="synchronisation">

        <title>Synchronisation</title>

        <para>TBD</para>

drivers/bluetooth/ath3k.c

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ 
static struct usb_device_id ath3k_table[] = {

	/* Atheros AR3011 */

	{ USB_DEVICE(0x0CF3, 0x3000) },



	/* Atheros AR3011 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x3002) },



	{ }	/* Terminating entry */

};

drivers/bluetooth/btusb.c

+9 −3
Original line number Diff line number Diff line
@@ -99,6 +99,9 @@ static struct usb_device_id blacklist_table[] = { 
	/* Broadcom BCM2033 without firmware */

	{ USB_DEVICE(0x0a5c, 0x2033), .driver_info = BTUSB_IGNORE },



	/* Atheros 3011 with sflash firmware */

	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },



	/* Broadcom BCM2035 */

	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
@@ -239,6 +242,7 @@ static void btusb_intr_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);
@@ -323,6 +327,7 @@ static void btusb_bulk_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);
@@ -412,6 +417,7 @@ static void btusb_isoc_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);

drivers/net/wireless/ath/ar9170/usb.c

+2 −4
Original line number Diff line number Diff line
@@ -161,8 +161,7 @@ static void ar9170_usb_submit_urb(struct ar9170_usb *aru) 
static void ar9170_usb_tx_urb_complete_frame(struct urb *urb)

{

	struct sk_buff *skb = urb->context;

	struct ar9170_usb *aru = (struct ar9170_usb *)

	      usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));

	struct ar9170_usb *aru = usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));



	if (unlikely(!aru)) {

		dev_kfree_skb_irq(skb);
@@ -219,8 +218,7 @@ static void ar9170_usb_irq_completed(struct urb *urb) 
static void ar9170_usb_rx_completed(struct urb *urb)

{

	struct sk_buff *skb = urb->context;

	struct ar9170_usb *aru = (struct ar9170_usb *)

		usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));

	struct ar9170_usb *aru = usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));

	int err;



	if (!aru)

drivers/net/wireless/ath/ath.h

+2 −0
Original line number Diff line number Diff line
@@ -168,6 +168,8 @@ struct ath_common { 
	struct ath_regulatory regulatory;

	const struct ath_ops *ops;

	const struct ath_bus_ops *bus_ops;



	bool btcoex_enabled;

};



struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,