linux-toradex.git/drivers/net/wan/dscc4.c, branch v2.6.33.11

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

2009-11-19T06:19:03+00:00

Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig

drivers/net/wan: remove exceptional & on function name

2009-11-18T18:48:51+00:00

In this file, function names are otherwise used as pointers without &.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)

// 
@r@
identifier f;
@@

f(...) { ... }

@@
identifier r.f;
@@

- &f
+ f
// 

Signed-off-by: Julia Lawall 
Signed-off-by: David S. Miller

headers: remove sched.h from interrupt.h

2009-10-11T18:20:58+00:00

After m68k's task_thread_info() doesn't refer to current,
it's possible to remove sched.h from interrupt.h and not break m68k!
Many thanks to Heiko Carstens for allowing this.

Signed-off-by: Alexey Dobriyan

WAN: dscc4: Fix warning pointing out a bug.

2009-09-04T04:34:39+00:00

Noticed by Stephen Rothwell:

	Today's linux-next build (x86_64 allmodconfig gcc-4.4.0)
	produced this warning:

	drivers/net/wan/dscc4.c: In function 'dscc4_rx_skb':
	drivers/net/wan/dscc4.c:670: warning: suggest parentheses around comparison in operand of '|'

	which actually points out a bug, I think.  It is doing
		(x & (y | z)) != y | z
	when it probably means
		(x & (y | z)) != (y | z)

	Introduced by commit 5de3fcab91b0e1809eec030355d15801daf25083
	("WAN: bit and/or confusion").

Signed-off-by: David S. Miller

wan: convert drivers to netdev_tx_t

2009-09-01T08:13:28+00:00

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

WAN: bit and/or confusion

2009-08-31T05:02:26+00:00

Fix the tests that check whether Frame* bits are not set

Signed-off-by: Roel Kluin 
Signed-off-by: David S. Miller

net: convert remaining non-symbolic return values in ndo_start_xmit() functions

2009-07-06T02:23:38+00:00

This patch converts the remaining occurences of raw return values to their
symbolic counterparts in ndo_start_xmit() functions that were missed by the
previous automatic conversion.

Additionally code that assumed the symbolic value of NETDEV_TX_OK to be zero
is changed to explicitly use NETDEV_TX_OK.

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

WAN: Convert generic HDLC drivers to netdev_ops.

2009-01-21T22:03:37+00:00

Also remove unneeded last_rx update from Synclink drivers.
Synclink part mostly by Stephen Hemminger.

Signed-off-by: Krzysztof Hałasa 
Signed-off-by: David S. Miller

drivers/net: Kill now superfluous ->last_rx stores.

2008-11-04T05:11:17+00:00

The generic packet receive code takes care of setting
netdev->last_rx when necessary, for the sake of the
bonding ARP monitor.

Drivers need not do it any more.

Some cases had to be skipped over because the drivers
were making use of the ->last_rx value themselves.

Signed-off-by: David S. Miller

pci: use pci_ioremap_bar() in drivers/net

2008-10-31T04:53:48+00:00

Use the newly introduced pci_ioremap_bar() function in drivers/net.
pci_ioremap_bar() just takes a pci device and a bar number, with the goal
of making it really hard to get wrong, while also having a central place
to stick sanity checks.

Signed-off-by: Arjan van de Ven 
Signed-off-by: Jeff Garzik