linux-toradex.git/drivers/net/cris, branch v2.6.32.33 Linux kernel for Apalis and Colibri modules Merge branch 'for-linus' of git://repo.or.cz/cris-mirror 2009-09-25T00:08:56+00:00 Linus Torvalds torvalds@linux-foundation.org 2009-09-25T00:08:56+00:00 5f8fe4270e53d38421ba34c428c3b58933b48e50 * 'for-linus' of git://repo.or.cz/cris-mirror: CRIS: Cleanup linker script using new linker script macros. ARRAY_SIZE changes CRIS: convert to asm-generic/hardirq.h CRISv10: Don't autonegotiate if autonegotiation is off CRIS: fix defconfig build failure CRIS: add pgprot_noncached 
* 'for-linus' of git://repo.or.cz/cris-mirror:
  CRIS: Cleanup linker script using new linker script macros.
  ARRAY_SIZE changes
  CRIS: convert to asm-generic/hardirq.h
  CRISv10: Don't autonegotiate if autonegotiation is off
  CRIS: fix defconfig build failure
  CRIS: add pgprot_noncached
CRISv10: Don't autonegotiate if autonegotiation is off 2009-08-31T16:38:17+00:00 Jesper Nilsson jesper.nilsson@axis.com 2009-08-31T16:28:26+00:00 e6cd19743bfc76ca81804c2a259e3a0d7b03fd73 If autonegotiation was disabled, we still set the BMCR_ANENABLE and BMCR_ANRESTART, which resulted in autonegotiation never being disabled. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> Reported-by: Julia Lawall <julia@diku.dk> 
If autonegotiation was disabled, we still set the
BMCR_ANENABLE and BMCR_ANRESTART, which resulted in autonegotiation
never being disabled.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Reported-by: Julia Lawall <julia@diku.dk>
net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions 2009-07-06T02:16:04+00:00 Patrick McHardy kaber@trash.net 2009-06-23T06:03:08+00:00 6ed106549d17474ca17a16057f4c0ed4eba5a7ca This patch is the result of an automatic spatch transformation to convert all ndo_start_xmit() return values of 0 to NETDEV_TX_OK. Some occurences are missed by the automatic conversion, those will be handled in a seperate patch. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> 
This patch is the result of an automatic spatch transformation to convert
all ndo_start_xmit() return values of 0 to NETDEV_TX_OK.

Some occurences are missed by the automatic conversion, those will be
handled in a seperate patch.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
eth_v10: convert to net_device_ops 2009-04-13T22:16:33+00:00 Alexander Beregalov a.beregalov@gmail.com 2009-04-11T07:45:55+00:00 a95c2a3b9d6615ef6fad69fbb787a208ad6506b3 Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-11-07T06:43:03+00:00 David S. Miller davem@davemloft.net 2008-11-07T06:43:03+00:00 9eeda9abd1faf489f3df9a1f557975f4c8650363 Conflicts: drivers/net/wireless/ath5k/base.c net/8021q/vlan_core.c 
Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c
[CRIS] Move header files from include to arch/cris/include. 2008-10-29T16:29:44+00:00 Jesper Nilsson jesper.nilsson@axis.com 2008-10-21T15:45:58+00:00 556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 Change all users of header files to correct path. Remove some unneeded headers for arch-v32. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> 
Change all users of header files to correct path.
Remove some unneeded headers for arch-v32.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
net: convert print_mac to %pM 2008-10-28T00:06:18+00:00 Johannes Berg johannes@sipsolutions.net 2008-10-27T22:59:26+00:00 e174961ca1a0b28f7abf0be47973ad57cb74e5f0 This converts pretty much everything to print_mac. There were a few things that had conflicts which I have just dropped for now, no harm done. I've built an allyesconfig with this and looked at the files that weren't built very carefully, but it's a huge patch. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: David S. Miller <davem@davemloft.net> 
This converts pretty much everything to print_mac. There were
a few things that had conflicts which I have just dropped for
now, no harm done.

I've built an allyesconfig with this and looked at the files
that weren't built very carefully, but it's a huge patch.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
CRIS v10: drivers/net/cris/eth_v10.c rename LED defines to CRIS_LED to avoid name clash. 2008-02-08T10:16:44+00:00 Jesper Nilsson jesper.nilsson@axis.com 2008-02-06T12:35:07+00:00 5efa1d1c940f07e79469e20db2b7a73c44180e82 






CRISv10 Ethernet declare mac fix
2007-11-15T02:45:47+00:00

Jesper Nilsson
jesper.nilsson@axis.com

2007-11-15T01:01:29+00:00

3eed6393644c960e2343db7dabec08c775d3738f

Declare mac using DECLARE_MAC_BUF for use when calling print_mac().

This fixes compile error where mac was undeclared.
Also, remove unused variable i.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <mikael.starvik@axis.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>





Declare mac using DECLARE_MAC_BUF for use when calling print_mac().

This fixes compile error where mac was undeclared.
Also, remove unused variable i.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <mikael.starvik@axis.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>







cris-build-fixes-update-eth_v10c-ethernet-driver-fix
2007-11-15T02:45:45+00:00

Andrew Morton
akpm@linux-foundation.org

2007-11-15T01:00:58+00:00

633edf5a4fff0675851e377cc5f0c9072683a5f4

Fix locking bug noted by  Roel Kluin <12o3l@tiscali.nl>.

Cc: Jeff Garzik <jeff@garzik.org>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>





Fix locking bug noted by  Roel Kluin <12o3l@tiscali.nl>.

Cc: Jeff Garzik <jeff@garzik.org>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>