linux.git/drivers/net/ethernet/sgi, branch v3.7

Merge tty-next into 3.6-rc1

2012-08-06T16:48:31+00:00

This handles the merge issue in:
	arch/um/drivers/line.c
	arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.

Signed-off-by: Greg Kroah-Hartman

8250: three way resolve of the 8250 diffs

2012-07-17T16:11:50+00:00

This resolves the differences between the original 8250 patch, the revised 8250 patch
and the independant clean up of the octeon driver (to use platform devices properly yay!)

Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

ethernet: Remove casts to same type

2012-06-06T16:31:33+00:00

Adding casts of objects to the same type is unnecessary
and confusing for a human reader.

For example, this cast:

        int y;
        int *p = (int *)&y;

I used the coccinelle script below to find and remove these
unnecessary casts.  I manually removed the conversions this
script produces of casts with __force, __iomem and __user.

@@
type T;
T *p;
@@

-       (T *)p
+       p

A function in atl1e_main.c was passed a const pointer
when it actually modified elements of the structure.

Change the argument to a non-const pointer.

A function in stmmac needed a __force to avoid a sparse
warning.  Added it.

Signed-off-by: Joe Perches 
Signed-off-by: David S. Miller

net: meth: Add set_rx_mode hook to fix ICMPv6 neighbor discovery

2011-12-27T18:17:34+00:00

SGI IP32 (O2)'s ethernet driver (meth) lacks a set_rx_mode function, which
prevents IPv6 from working completely because any ICMPv6 neighbor
solicitation requests aren't picked up by the driver.  So the machine can
ping out and connect to other systems, but other systems will have a very
hard time connecting to the O2.

Signed-off-by: Joshua Kinard 
Signed-off-by: David S. Miller

net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver()

2011-11-29T05:25:05+00:00

This patch converts the drivers in drivers/net/ethernet/* to use the
module_platform_driver() macro which makes the code smaller and a bit
simpler.

Cc: "David S. Miller" 
Cc: Pantelis Antoniou 
Cc: Vitaly Bordug 
Cc: Wan ZongShun 
Cc: Nicolas Pitre 
Cc: Giuseppe Cavallaro 
Cc: Marc Kleine-Budde 
Cc: Jeff Kirsher 
Cc: Jiri Pirko 
Cc: Daniel Hellstrom 
Cc: Alexey Dobriyan 
Cc: Tobias Klauser 
Cc: Grant Likely 
Cc: Jiri Kosina 
Cc: Richard Cochran 
Cc: Jonas Bonn 
Cc: Sebastian Poehn 
Cc: Yoshihiro Shimoda 
Cc: Ricardo Ribalda Delgado 
Cc: "Michał Mirosław" 
Signed-off-by: Axel Lin 
Acked-by: Wan ZongShun 
Signed-off-by: David S. Miller

MII: fix Kconfig dependencies for MII

2011-09-15T19:49:08+00:00

MII Kconfig option is apart of the core networking drivers and
by default NET_CORE is enabled so drivers selecting MII will
have MII enabled as well.  It was found using the randconfig
option during testing, MII would be selected but NET_CORE
could be disabled.  This caused a dependency error.

Resolved the dependency by selecting NET_CORE when MII is
selected.

Reported-by: Emil Tantilov 
Signed-off-by: Jeff Kirsher 
Tested-by: Aaron Brown 
Signed-off-by: David S. Miller

drivers/net/ethernet/*: Enabled vendor Kconfig options

2011-08-27T07:58:56+00:00

Based on finds for Stephen Rothwell, where current defconfig's
enable a ethernet driver and it is not compiled due to the newly
added NET_VENDOR_* component of Kconfig.

This patch enables all the "new" Kconfig options so that current
defconfig's will continue to compile the expected drivers.  In
addition, by enabling all the new Kconfig options does not add
any un-expected options.

CC: Stephen Rothwll 
Signed-off-by: Jeff Kirsher

net: remove use of ndo_set_multicast_list in drivers

2011-08-18T03:22:03+00:00

replace it by ndo_set_rx_mode

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

ioc3-eth/meth: Move the SGI drivers

2011-08-12T07:21:33+00:00

Move the SGI drivers into drivers/net/ethernet/sgi/ and make the
necessary Kconfig and Makefile changes.

CC: Ralf Baechle 
Signed-off-by: Jeff Kirsher