Linux kernel stable tree (mirror) https://git.radix-linux.su/kernel/linux.git/atom?h=linux-2.6.35.y 2011-08-01T20:54:48+00:00 2011-08-01T20:54:48+00:00 Geert Uytterhoeven geert@linux-m68k.org 2011-05-12T09:11:38+00:00 urn:sha1:2dcdb613c69f16e6c22b05010a92c104b8a8deee commit cf7e032fc87d59c475df26c4d40bf45d401b2adb upstream. Changeset b6114794a1c394534659f4a17420e48cf23aa922 ("zorro8390: convert to net_device_ops") broke zorro8390 by adding 8390.o to the link. That meant that lib8390.c was included twice, once in zorro8390.c and once in 8390.c, subject to different macros. This patch reverts that by avoiding the wrappers in 8390.c. Fix based on commits 217cbfa856dc1cbc2890781626c4032d9e3ec59f ("mac8390: fix regression caused during net_device_ops conversion") and 4e0168fa4842e27795a75b205a510f25b62181d9 ("mac8390: fix build with NET_POLL_CONTROLLER"). Reported-by: Christian T. Steigies <cts@debian.org> Suggested-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Tested-by: Christian T. Steigies <cts@debian.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andi Kleen <ak@linux.intel.com> 2011-08-01T20:54:48+00:00 Geert Uytterhoeven geert@linux-m68k.org 2011-05-12T09:11:39+00:00 urn:sha1:02b5e373b2f4a28762cb6ff908b9b726bb17c844 commit 0b25e0157dfa236a0629c16c8ad6f222f633f682 upstream. Changeset 5618f0d1193d6b051da9b59b0e32ad24397f06a4 ("hydra: convert to net_device_ops") broke hydra by adding 8390.o to the link. That meant that lib8390.c was included twice, once in hydra.c and once in 8390.c, subject to different macros. This patch reverts that by avoiding the wrappers in 8390.c. Fix based on commits 217cbfa856dc1cbc2890781626c4032d9e3ec59f ("mac8390: fix regression caused during net_device_ops conversion") and 4e0168fa4842e27795a75b205a510f25b62181d9 ("mac8390: fix build with NET_POLL_CONTROLLER"). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andi Kleen <ak@linux.intel.com> 2011-08-01T20:54:48+00:00 Geert Uytterhoeven geert@linux-m68k.org 2011-05-12T09:11:40+00:00 urn:sha1:f6f5ac3edfdc5b1f5595d0216b1ac6cc5448024c commit 2592a7354092afd304a8c067319b15ab1e441e35 upstream. Changeset dcd39c90290297f6e6ed8a04bb20da7ac2b043c5 ("ne-h8300: convert to net_device_ops") broke ne-h8300 by adding 8390.o to the link. That meant that lib8390.c was included twice, once in ne-h8300.c and once in 8390.c, subject to different macros. This patch reverts that by avoiding the wrappers in 8390.c. Fix based on commits 217cbfa856dc1cbc2890781626c4032d9e3ec59f ("mac8390: fix regression caused during net_device_ops conversion") and 4e0168fa4842e27795a75b205a510f25b62181d9 ("mac8390: fix build with NET_POLL_CONTROLLER"). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andi Kleen <ak@linux.intel.com> 2010-04-27T19:49:13+00:00 David S. Miller davem@davemloft.net 2010-04-27T19:49:13+00:00 urn:sha1:e1703b36c358dde24ececba4fd609ecd91433ba3 Conflicts: drivers/net/e100.c drivers/net/e1000e/netdev.c 2010-04-22T05:43:18+00:00 Diego Giagio diego@giagio.com 2010-04-18T08:35:16+00:00 urn:sha1:a19259c3d589a014e5f47f148f74dfc44422c82b Add new driver to use tethering with an iPhone device. After initial submission, apply fixes to fit the new driver into the kernel standards. There are still a couple of minor (almost cosmetic-level) issues, but the driver is fully functional right now. Signed-off-by: L. Alberto Giménez <agimenez@sysvalve.es> Signed-off-by: Diego Giagio <diego@giagio.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2010-04-07T06:53:30+00:00 David S. Miller davem@davemloft.net 2010-04-07T06:53:30+00:00 urn:sha1:4a35ecf8bf1c4b039503fa554100fe85c761de76 Conflicts: drivers/net/bonding/bond_main.c drivers/net/via-velocity.c drivers/net/wireless/iwlwifi/iwl-agn.c 2010-04-03T21:56:01+00:00 James Chapman jchapman@katalix.com 2010-04-02T06:18:28+00:00 urn:sha1:21b4aaa14329db793832e865f15000c5c0192ac3 This patch moves the existing pppol2tp driver from drivers/net into a new net/l2tp directory, which is where the upcoming L2TPv3 code will live. The existing CONFIG_PPPOL2TP config option is left in its current place to avoid "make oldconfig" issues when an existing pppol2tp user takes this change. (This is the same approach used for the pppoatm driver, which moved to net/atm.) There are no code changes. The existing drivers/net/pppol2tp.c is simply moved to net/l2tp. Signed-off-by: James Chapman <jchapman@katalix.com> Reviewed-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2010-04-02T02:29:17+00:00 Dimitris Michailidis dm@chelsio.com 2010-04-01T15:28:27+00:00 urn:sha1:43e9da8d782b8a40d5127fcc59ac2e543cf16d7d Signed-off-by: Dimitris Michailidis <dm@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2010-03-31T02:08:50+00:00 Sjur Braendeland sjur.brandeland@stericsson.com 2010-03-30T13:56:30+00:00 urn:sha1:9b27105b4a44c54bf91ecd7d0315034ae75684f7 Add CAIF Serial driver. This driver is implemented as a line discipline. caif_serial uses the following module parameters: ser_use_stx - specifies if STart of frame eXtension is in use. ser_loop - sets the interface in loopback mode. Signed-off-by: Sjur Braendeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2010-02-17T23:59:40+00:00 Kristoffer Glembo kristoffer@gaisler.com 2010-02-15T03:33:44+00:00 urn:sha1:d4c41139df6e74c6fff0cbac43e51cab782133be Adds device driver for Aeroflex Gaisler 10/100 and 10/100/1G Ethernet MAC IP cores. Signed-off-by: Kristoffer Glembo <kristoffer@gaisler.com> Signed-off-by: David S. Miller <davem@davemloft.net>