linux.git/drivers/net/ethernet/micrel, branch v3.11

net: Move MII out from under NET_CORE and hide it

2013-06-20T05:22:56+00:00

All drivers that select MII also need to select NET_CORE because MII
depends on it.  This is a bit ridiculous because NET_CORE is just a
menu option that doesn't enable any code by itself.

There is also no need for it to be a visible option, since its users
all select it.

Signed-off-by: Ben Hutchings 
Acked-by: Jeff Kirsher 
Signed-off-by: David S. Miller

net: micrel : ks8851-ml: add dt support

2013-05-28T06:17:53+00:00

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD 
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller

net: ethernet: remove unnecessary platform_set_drvdata()

2013-05-28T05:34:51+00:00

The driver core clears the driver data to NULL after device_release
or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
(device-core: Ensure drvdata = NULL when no driver is bound).
Thus, it is not needed to manually clear the device driver data to NULL.

Signed-off-by: Jingoo Han 
Acked-by: Nicolas Ferre 
Acked-by: Rob Herring 
Acked-by: Roland Stigge 
Acked-by: Mugunthan V N 
Reviewed-by: H Hartley Sweeten 
Tested-by: Roland Stigge 
Signed-off-by: David S. Miller

ks8851: Remove unneeded PM_OPS definitions

2013-04-16T20:30:51+00:00

SIMPLE_DEV_PM_OPS macro can handle !CONFIG_PM_SLEEP case nicely, so there is no
need to define PM_OPS for both CONFIG_PM_SLEEP and !CONFIG_PM_SLEEP cases.

Remove the unneeded definitions.

Cc: Lars-Peter Clausen 
Signed-off-by: Fabio Estevam 
Signed-off-by: David S. Miller

net: ks8851: Use dev_pm_ops

2013-04-08T20:55:26+00:00

Use dev_pm_ops instead of the deprecated legacy suspend/resume callbacks.

Signed-off-by: Lars-Peter Clausen 
Signed-off-by: David S. Miller

net: ks8851: Use module_spi_driver

2013-04-08T20:52:21+00:00

By using module_spi_driver we can eliminate a few lines of boilerplate code.

Signed-off-by: Lars-Peter Clausen 
Signed-off-by: David S. Miller

net: ethernet: ks8851: use spi_get_drvdata() and spi_set_drvdata()

2013-04-07T20:48:18+00:00

Use the wrapper functions for getting and setting the driver data using
spi_device instead of using dev_{get|set}_drvdata with &spi->dev, so we
can directly pass a struct spi_device.

Signed-off-by: Jingoo Han 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-04-01T17:36:50+00:00

Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h

Two minor conflicts in wireless.  Overlapping additions of extern
declarations in net/wireless/core.h and a bug fix overlapping with
the addition of a boolean parameter to __ieee80211_key_free().

Signed-off-by: David S. Miller

ks8851: Fix interpretation of rxlen field.

2013-03-29T19:43:08+00:00

According to the Datasheet (page 52):
15-12 Reserved
11-0 RXBC Receive Byte Count
This field indicates the present received frame byte size.

The code has a bug:
                 rxh = ks8851_rdreg32(ks, KS_RXFHSR);
                 rxstat = rxh & 0xffff;
                 rxlen = rxh >> 16; // BUG!!! 0xFFF mask should be applied

Signed-off-by: Max Nekludov 
Signed-off-by: David S. Miller

net: ks8695net: Use module_platform_driver()

2013-03-20T17:25:36+00:00

module_platform_driver macro removes some boilerplate and
simplifies the code.

Signed-off-by: Sachin Kamat 
Signed-off-by: David S. Miller