linux.git/drivers/net, branch v3.1-rc2 Linux kernel source tree Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2011-08-12T06:09:46+00:00 David S. Miller davem@davemloft.net 2011-08-12T06:09:46+00:00 d80bcf46f1dae47805260dc60fb900cc4dabe35e 






e1000e: increase driver version number
2011-08-11T22:23:58+00:00

Bruce Allan
bruce.w.allan@intel.com

2011-07-22T06:22:02+00:00

12440928dca77eccc8a793cf3cd83d017abbd7d6

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>





Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>







e1000e: alternate MAC address update
2011-08-11T22:21:05+00:00

Bruce Allan
bruce.w.allan@intel.com

2011-07-29T05:53:07+00:00

244735f6ebccbf72a283db89472309f770e14c80

If word 0x37 in the EEPROM is 0xFFFF _or_ 0x0000, then there is no
alternate MAC address in the EEPROM.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>





If word 0x37 in the EEPROM is 0xFFFF _or_ 0x0000, then there is no
alternate MAC address in the EEPROM.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>







e1000e: do not disable receiver on 82574/82583
2011-08-11T22:19:06+00:00

Bruce Allan
bruce.w.allan@intel.com

2011-07-22T06:21:35+00:00

7f99ae633884043c70f4cc4a03f43dad0f0ecba2

Due to a hardware erratum, the receiver on 82574 and 82583 should not be
stopped once it has been started.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>





Due to a hardware erratum, the receiver on 82574 and 82583 should not be
stopped once it has been started.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>







e1000e: alternate MAC address does not work on device id 0x1060
2011-08-11T22:16:28+00:00

Bruce Allan
bruce.w.allan@intel.com

2011-07-22T06:21:51+00:00

c407bee8a56d874b91f3e4ee790660959ff1a25e

This issue is present all the way back to 2.6.34 kernels.

CC: <stable@kernel.org>
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeffrey Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>





This issue is present all the way back to 2.6.34 kernels.

CC: <stable@kernel.org>
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeffrey Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>







Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-08-11T17:37:26+00:00

John W. Linville
linville@tuxdriver.com

2011-08-11T17:37:26+00:00

a06d8aba0e3f7faa30e95b12220b0c90bca41a07












PCnet: Fix section mismatch
2011-08-11T14:42:45+00:00

Ralf Baechle
ralf@linux-mips.org

2011-08-10T05:23:46+00:00

aa02bc7084501d2edecb0e5b9de56da070db19aa

Building MIPS mtx1_defconfig results in:

  MODPOST 735 modules
WARNING: drivers/net/pcnet32.o(.devinit.text+0x11ec): Section mismatch in reference from the function pcnet32_probe_vlbus.constprop.22() to the variable .init.data:pcnet32_portlist
The function __devinit pcnet32_probe_vlbus.constprop.22() references
a variable __initdata pcnet32_portlist.
If pcnet32_portlist is only used by pcnet32_probe_vlbus.constprop.22 then
annotate pcnet32_portlist with a matching annotation.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>





Building MIPS mtx1_defconfig results in:

  MODPOST 735 modules
WARNING: drivers/net/pcnet32.o(.devinit.text+0x11ec): Section mismatch in reference from the function pcnet32_probe_vlbus.constprop.22() to the variable .init.data:pcnet32_portlist
The function __devinit pcnet32_probe_vlbus.constprop.22() references
a variable __initdata pcnet32_portlist.
If pcnet32_portlist is only used by pcnet32_probe_vlbus.constprop.22 then
annotate pcnet32_portlist with a matching annotation.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>







bnx2x: disable dcb on 578xx since not supported yet
2011-08-11T14:14:53+00:00

Dmitry Kravkov
dmitry@broadcom.com

2011-08-09T03:11:13+00:00

7712b644964c36d1216315b791faccc7d5238b16

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>





Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>







bnx2x: properly clean indirect addresses
2011-08-11T14:14:53+00:00

Dmitry Kravkov
dmitry@broadcom.com

2011-08-09T03:10:29+00:00

9f0096a1578bca77b28762c89b29affee69a20f4

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>





Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>







bnx2x: prevent race between undi_unload and load flows
2011-08-11T14:14:53+00:00

Dmitry Kravkov
dmitry@broadcom.com

2011-08-09T03:09:52+00:00

2031bd3a8adce1259756e7f142b230c010035995

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>





Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>