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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents bcf0dda8 e91e9d49

drivers/net/wireless/ipw2200.c

+1 −0
Original line number Diff line number Diff line
@@ -11577,6 +11577,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv) 
	priv->prom_priv->priv = priv;



	strcpy(priv->prom_net_dev->name, "rtap%d");

	memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);



	priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;

	priv->prom_net_dev->open = ipw_prom_open;

drivers/net/wireless/iwlwifi/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ config IWL4965_HT 
	bool "Enable 802.11n HT features in iwl4965 driver"

	depends on EXPERIMENTAL

	depends on IWL4965 && IWL4965_QOS

	depends on n

	---help---

	  This option enables IEEE 802.11n High Throughput features

	  for the iwl4965 driver.

drivers/net/wireless/libertas/assoc.c

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ void lbs_association_worker(struct work_struct *work) 
	}



	if (find_any_ssid) {

		u8 new_mode;

		u8 new_mode = assoc_req->mode;



		ret = lbs_find_best_network_ssid(priv, assoc_req->ssid,

				&assoc_req->ssid_len, assoc_req->mode, &new_mode);

drivers/net/wireless/rt2x00/rt61pci.c

+1 −3
Original line number Diff line number Diff line
@@ -2399,11 +2399,9 @@ static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb, 
	 * beacon frame.

	 */

	if (skb_headroom(skb) < TXD_DESC_SIZE) {

		if (pskb_expand_head(skb, TXD_DESC_SIZE, 0, GFP_ATOMIC)) {

			dev_kfree_skb(skb);

		if (pskb_expand_head(skb, TXD_DESC_SIZE, 0, GFP_ATOMIC))

			return -ENOMEM;

	}

	}



	/*

	 * Add the descriptor in front of the skb.

drivers/ssb/driver_mipscore.c

+7 −6
Original line number Diff line number Diff line
@@ -109,13 +109,14 @@ static void set_irq(struct ssb_device *dev, unsigned int irq) 
		clear_irq(bus, oldirq);



	/* assign the new one */

	if (irq == 0)

		ssb_write32(mdev, SSB_INTVEC, ((1 << irqflag) & ssb_read32(mdev, SSB_INTVEC)));



	if (irq == 0) {

		ssb_write32(mdev, SSB_INTVEC, ((1 << irqflag) | ssb_read32(mdev, SSB_INTVEC)));

	} else {

		irqflag <<= ipsflag_irq_shift[irq];

		irqflag |= (ssb_read32(mdev, SSB_IPSFLAG) & ~ipsflag_irq_mask[irq]);

		ssb_write32(mdev, SSB_IPSFLAG, irqflag);

	}

}



static void ssb_mips_serial_init(struct ssb_mipscore *mcore)

{