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

Commit 63a07cb6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
  mac80211: fix deauth before assoc
  iwlwifi: add missing rcu_read_lock
  mac80211: fix function pointer check
  wireless: remove my name from the maintainer list
  ath5k: fix NULL pointer in antenna configuration
  p54usb: Add device ID for Dell WLA3310 USB
  wl1251: fix a memory leak in probe
  ipmr: dont corrupt lists
  8139too: fix buffer overrun in rtl8139_init_board
  asix: check packet size against mtu+ETH_HLEN instead of ETH_FRAME_LEN
  r8169: fix random mdio_write failures
  ip6mr: fix a typo in ip6mr_for_each_table()
  iwlwifi: move sysfs_create_group to post request firmware
  iwlwifi: add name to Maintainers list
  iwl3945: fix internal scan
  iwl3945: enable stuck queue detection on 3945
  ipv6: avoid high order allocations
  ath5k: retain promiscuous setting
  ath5k: depend on CONFIG_PM_SLEEP for suspend/resume functions
  mac80211: process station blockack action frames from work
  ...
parents b95a5680 327723ed

MAINTAINERS

+1 −4
Original line number Diff line number Diff line
@@ -2978,7 +2978,6 @@ F: drivers/net/ixgb/ 
F:	drivers/net/ixgbe/



INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT

M:	Zhu Yi <yi.zhu@intel.com>

M:	Reinette Chatre <reinette.chatre@intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

L:	linux-wireless@vger.kernel.org
@@ -2988,7 +2987,6 @@ F: Documentation/networking/README.ipw2100 
F:	drivers/net/wireless/ipw2x00/ipw2100.*



INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT

M:	Zhu Yi <yi.zhu@intel.com>

M:	Reinette Chatre <reinette.chatre@intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

L:	linux-wireless@vger.kernel.org
@@ -3019,8 +3017,8 @@ F: drivers/net/wimax/i2400m/ 
F:	include/linux/wimax/i2400m.h



INTEL WIRELESS WIFI LINK (iwlwifi)

M:	Zhu Yi <yi.zhu@intel.com>

M:	Reinette Chatre <reinette.chatre@intel.com>

M:	Wey-Yi Guy <wey-yi.w.guy@intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

L:	linux-wireless@vger.kernel.org

W:	http://intellinuxwireless.org
@@ -3030,7 +3028,6 @@ F: drivers/net/wireless/iwlwifi/ 


INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)

M:	Samuel Ortiz <samuel.ortiz@intel.com>

M:	Zhu Yi <yi.zhu@intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

L:	linux-wireless@vger.kernel.org

S:	Supported

drivers/net/8139too.c

+1 −0
Original line number Diff line number Diff line
@@ -860,6 +860,7 @@ static __devinit struct net_device * rtl8139_init_board (struct pci_dev *pdev) 
		}



	/* if unknown chip, assume array element #0, original RTL-8139 in this case */

	i = 0;

	dev_dbg(&pdev->dev, "unknown chip version, assuming RTL-8139\n");

	dev_dbg(&pdev->dev, "TxConfig = 0x%lx\n", RTL_R32 (TxConfig));

	tp->chipset = 0;

drivers/net/r8169.c

+5 −0
Original line number Diff line number Diff line
@@ -559,6 +559,11 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value) 
			break;

		udelay(25);

	}

	/*

	 * Some configurations require a small delay even after the write

	 * completed indication or the next write might fail.

	 */

	udelay(25);

}



static int mdio_read(void __iomem *ioaddr, int reg_addr)

drivers/net/usb/asix.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 
			return 2;

		}



		if (size > ETH_FRAME_LEN) {

		if (size > dev->net->mtu + ETH_HLEN) {

			netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",

				   size);

			return 0;

drivers/net/wireless/ath/ath5k/base.c

+7 −5
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static const struct ieee80211_rate ath5k_rates[] = { 
static int __devinit	ath5k_pci_probe(struct pci_dev *pdev,

				const struct pci_device_id *id);

static void __devexit	ath5k_pci_remove(struct pci_dev *pdev);

#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int		ath5k_pci_suspend(struct device *dev);

static int		ath5k_pci_resume(struct device *dev);
@@ -203,7 +203,7 @@ static SIMPLE_DEV_PM_OPS(ath5k_pm_ops, ath5k_pci_suspend, ath5k_pci_resume); 
#define ATH5K_PM_OPS	(&ath5k_pm_ops)

#else

#define ATH5K_PM_OPS	NULL

#endif /* CONFIG_PM */

#endif /* CONFIG_PM_SLEEP */



static struct pci_driver ath5k_pci_driver = {

	.name		= KBUILD_MODNAME,
@@ -708,7 +708,7 @@ ath5k_pci_remove(struct pci_dev *pdev) 
	ieee80211_free_hw(hw);

}



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int ath5k_pci_suspend(struct device *dev)

{

	struct ieee80211_hw *hw = pci_get_drvdata(to_pci_dev(dev));
@@ -734,7 +734,7 @@ static int ath5k_pci_resume(struct device *dev) 
	ath5k_led_enable(sc);

	return 0;

}

#endif /* CONFIG_PM */

#endif /* CONFIG_PM_SLEEP */





/***********************\
@@ -3140,13 +3140,15 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw, 


	if (changed_flags & (FIF_PROMISC_IN_BSS | FIF_OTHER_BSS)) {

		if (*new_flags & FIF_PROMISC_IN_BSS) {

			rfilt |= AR5K_RX_FILTER_PROM;

			__set_bit(ATH_STAT_PROMISC, sc->status);

		} else {

			__clear_bit(ATH_STAT_PROMISC, sc->status);

		}

	}



	if (test_bit(ATH_STAT_PROMISC, sc->status))

		rfilt |= AR5K_RX_FILTER_PROM;



	/* Note, AR5K_RX_FILTER_MCAST is already enabled */

	if (*new_flags & FIF_ALLMULTI) {

		mfilt[0] =  ~0;