Commit d72751ed authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of... 

Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
parents 0a0e9ae1 85a7045a

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ source "drivers/net/wireless/b43legacy/Kconfig" 
source "drivers/net/wireless/hostap/Kconfig"

source "drivers/net/wireless/ipw2x00/Kconfig"

source "drivers/net/wireless/iwlwifi/Kconfig"

source "drivers/net/wireless/iwlegacy/Kconfig"

source "drivers/net/wireless/iwmc3200wifi/Kconfig"

source "drivers/net/wireless/libertas/Kconfig"

source "drivers/net/wireless/orinoco/Kconfig"

drivers/net/wireless/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ obj-$(CONFIG_B43LEGACY) += b43legacy/ 
obj-$(CONFIG_ZD1211RW)		+= zd1211rw/

obj-$(CONFIG_RTL8180)		+= rtl818x/

obj-$(CONFIG_RTL8187)		+= rtl818x/

obj-$(CONFIG_RTL8192CE)		+= rtlwifi/

obj-$(CONFIG_RTLWIFI)		+= rtlwifi/



# 16-bit wireless PCMCIA client drivers

obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
@@ -41,7 +41,8 @@ obj-$(CONFIG_ADM8211) += adm8211.o 


obj-$(CONFIG_MWL8K)	+= mwl8k.o



obj-$(CONFIG_IWLWIFI)	+= iwlwifi/

obj-$(CONFIG_IWLAGN)	+= iwlwifi/

obj-$(CONFIG_IWLWIFI_LEGACY)	+= iwlegacy/

obj-$(CONFIG_RT2X00)	+= rt2x00/



obj-$(CONFIG_P54_COMMON)	+= p54/

drivers/net/wireless/adm8211.c

+1 −3
Original line number Diff line number Diff line
@@ -1658,7 +1658,7 @@ static void adm8211_tx_raw(struct ieee80211_hw *dev, struct sk_buff *skb, 
}



/* Put adm8211_tx_hdr on skb and transmit */

static int adm8211_tx(struct ieee80211_hw *dev, struct sk_buff *skb)

static void adm8211_tx(struct ieee80211_hw *dev, struct sk_buff *skb)

{

	struct adm8211_tx_hdr *txhdr;

	size_t payload_len, hdrlen;
@@ -1707,8 +1707,6 @@ static int adm8211_tx(struct ieee80211_hw *dev, struct sk_buff *skb) 
	txhdr->retry_limit = info->control.rates[0].count;



	adm8211_tx_raw(dev, skb, plcp_signal, hdrlen);



	return NETDEV_TX_OK;

}



static int adm8211_alloc_rings(struct ieee80211_hw *dev)

drivers/net/wireless/at76c50x-usb.c

+5 −5
Original line number Diff line number Diff line
@@ -1728,7 +1728,7 @@ static void at76_mac80211_tx_callback(struct urb *urb) 
	ieee80211_wake_queues(priv->hw);

}



static int at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb)

static void at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb)

{

	struct at76_priv *priv = hw->priv;

	struct at76_tx_buffer *tx_buffer = priv->bulk_out_buffer;
@@ -1741,7 +1741,8 @@ static int at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
	if (priv->tx_urb->status == -EINPROGRESS) {

		wiphy_err(priv->hw->wiphy,

			  "%s called while tx urb is pending\n", __func__);

		return NETDEV_TX_BUSY;

		dev_kfree_skb_any(skb);

		return;

	}



	/* The following code lines are important when the device is going to
@@ -1755,7 +1756,8 @@ static int at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
		if (compare_ether_addr(priv->bssid, mgmt->bssid)) {

			memcpy(priv->bssid, mgmt->bssid, ETH_ALEN);

			ieee80211_queue_work(hw, &priv->work_join_bssid);

			return NETDEV_TX_BUSY;

			dev_kfree_skb_any(skb);

			return;

		}

	}
@@ -1795,8 +1797,6 @@ static int at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
				  priv->tx_urb,

				  priv->tx_urb->hcpriv, priv->tx_urb->complete);

	}



	return 0;

}



static int at76_mac80211_start(struct ieee80211_hw *hw)

drivers/net/wireless/ath/ar9170/ar9170.h

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ void ar9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len); 
int ar9170_nag_limiter(struct ar9170 *ar);



/* MAC */

int ar9170_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb);

void ar9170_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb);

int ar9170_init_mac(struct ar9170 *ar);

int ar9170_set_qos(struct ar9170 *ar);

int ar9170_update_multicast(struct ar9170 *ar, const u64 mc_hast);