kernel/linux.git/drivers/net/bmac.c, branch v2.6.32

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

2009-08-13T00:44:53+00:00

Conflicts: arch/microblaze/include/asm/socket.h

Fix compile error in bmac.c

2009-07-10T03:32:31+00:00

Looks like the change in ad361c9884e809340f6daca80d56a9e9c871690a wasn't compile tested. Signed-off-by: Dave Jones Acked-by: David S. Miller Signed-off-by: Linus Torvalds

Remove multiple KERN_ prefixes from printk formats

2009-07-08T17:30:03+00:00

Commit 5fd29d6ccbc98884569d6f3105aeca70858b3e0f ("printk: clean up handling of log-levels and newlines") changed printk semantics. printk lines with multiple KERN_ prefixes are no longer emitted as before the patch. is now included in the output on each additional use. Remove all uses of multiple KERN_s in formats. Signed-off-by: Joe Perches Signed-off-by: Linus Torvalds

net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions

2009-07-06T02:16:04+00:00

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 Signed-off-by: David S. Miller

bmac: convert to net_device_ops

2009-04-16T09:20:06+00:00

Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller

bmac: remove unused variable bp in bmac_misc_intr()

2009-03-13T21:17:16+00:00

From: Pavel Roskin Signed-off-by: David S. Miller

net: struct device - replace bus_id with dev_name(), dev_set_name()

2009-01-27T05:12:58+00:00

Signed-off-by: Kay Sievers Acked-by: Greg Kroah-Hartman 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

net: convert print_mac to %pM

2008-10-28T00:06:18+00:00

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 Signed-off-by: David S. Miller

[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()

2007-10-10T23:51:42+00:00

This is nicer than the MAC_FMT stuff. Signed-off-by: Joe Perches Signed-off-by: David S. Miller