Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (bcfe3c20) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/ath/ath9k/rc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -679,7 +679,7 @@ static u8 ath_rc_get_highest_rix(struct ath_softc *sc,
		return rate;

		if (rate_table->info[rate].valid_single_stream &&
		!(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG));
		!(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG))
		return rate;

		/* This should not happen */

+13 −2

Original line number	Diff line number	Diff line
		@@ -1157,8 +1157,9 @@ struct b43_dmaring parse_cookie(struct b43_wldev dev, u16 cookie, int *slot)
		}

		static int dma_tx_fragment(struct b43_dmaring *ring,
		struct sk_buff *skb)
		struct sk_buff **in_skb)
		{
		struct sk_buff skb = in_skb;
		const struct b43_dma_ops *ops = ring->ops;
		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
		u8 *header;
		@@ -1224,8 +1225,14 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
		}

		memcpy(skb_put(bounce_skb, skb->len), skb->data, skb->len);
		memcpy(bounce_skb->cb, skb->cb, sizeof(skb->cb));
		bounce_skb->dev = skb->dev;
		skb_set_queue_mapping(bounce_skb, skb_get_queue_mapping(skb));
		info = IEEE80211_SKB_CB(bounce_skb);

		dev_kfree_skb_any(skb);
		skb = bounce_skb;
		*in_skb = bounce_skb;
		meta->skb = skb;
		meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1);
		if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) {
		@@ -1355,7 +1362,11 @@ int b43_dma_tx(struct b43_wldev dev, struct sk_buff skb)
		* static, so we don't need to store it per frame. */
		ring->queue_prio = skb_get_queue_mapping(skb);

		err = dma_tx_fragment(ring, skb);
		/* dma_tx_fragment might reallocate the skb, so invalidate pointers pointing
		* into the skb data or cb now. */
		hdr = NULL;
		info = NULL;
		err = dma_tx_fragment(ring, &skb);
		if (unlikely(err == -ENOKEY)) {
		/* Drop this packet, as we don't have the encryption key
		* anymore and must not transmit it unencrypted. */

+4 −1

Original line number	Diff line number	Diff line
		@@ -6325,8 +6325,10 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,

		fail:
		if (dev) {
		if (registered)
		if (registered) {
		unregister_ieee80211(priv->ieee);
		unregister_netdev(dev);
		}

		ipw2100_hw_stop_adapter(priv);

		@@ -6383,6 +6385,7 @@ static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
		/* Unregister the device first - this results in close()
		* being called if the device is open. If we free storage
		* first, then close() will crash. */
		unregister_ieee80211(priv->ieee);
		unregister_netdev(dev);

		/* ipw2100_down will ensure that there is no more pending work

+2 −0

Original line number	Diff line number	Diff line
		@@ -11821,6 +11821,7 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
		if (err) {
		IPW_ERROR("Failed to register promiscuous network "
		"device (error %d).\n", err);
		unregister_ieee80211(priv->ieee);
		unregister_netdev(priv->net_dev);
		goto out_remove_sysfs;
		}
		@@ -11871,6 +11872,7 @@ static void __devexit ipw_pci_remove(struct pci_dev *pdev)

		mutex_unlock(&priv->mutex);

		unregister_ieee80211(priv->ieee);
		unregister_netdev(priv->net_dev);

		if (priv->rxq) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -1020,6 +1020,7 @@ static inline int libipw_is_cck_rate(u8 rate)
		/* ieee80211.c */
		extern void free_ieee80211(struct net_device *dev, int monitor);
		extern struct net_device *alloc_ieee80211(int sizeof_priv, int monitor);
		extern void unregister_ieee80211(struct libipw_device *ieee);
		extern int libipw_change_mtu(struct net_device *dev, int new_mtu);

		extern void libipw_networks_age(struct libipw_device *ieee,