linux-stable.git/drivers/net/ethernet/dec, branch linux-3.12.y

drivers/net: tulip_remove_one needs to call pci_disable_device()

2014-04-25T16:45:50+00:00

commit c321f7d7c87cdc623c87845f6378620573e57512 upstream.

Otherwise the device is not completely shut down.

Signed-off-by: Ingo Molnar 
Signed-off-by: Thomas Gleixner 
Signed-off-by: Sebastian Andrzej Siewior 
Signed-off-by: David S. Miller 
Signed-off-by: Jiri Slaby

net: tulip: remove deprecated IRQF_DISABLED

2013-09-13T03:27:09+00:00

This patch proposes to remove the IRQF_DISABLED flag from
drivers/net/ethernet/dec/tulip/de4x5.c

It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: Michael Opdenacker 
Acked-by: Grant Grundler 
Signed-off-by: David S. Miller

net: tulip: use pci_{get,set}_drvdata()

2013-09-04T02:38:46+00:00

Use the wrapper functions for getting and setting the driver data
using pci_dev instead of using dev_{get,set}_drvdata() with
&pdev->dev, so we can directly pass a struct pci_dev. This is
a purely cosmetic change.

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

ethernet: Convert mac address uses of 6 to ETH_ALEN

2013-08-02T19:33:54+00:00

Use the normal #define to help grep find mac addresses
and ensure that addresses are aligned.

pasemi.h has an unaligned access to mac_addr, unchanged
for now.

Signed-off-by: Joe Perches 
Acked-by: Olof Johansson  # pasemi_mac pieces
Signed-off-by: David S. Miller

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

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

2013-06-19T23:49:39+00:00

Conflicts:
	drivers/net/wireless/ath/ath9k/Kconfig
	drivers/net/xen-netback/netback.c
	net/batman-adv/bat_iv_ogm.c
	net/wireless/nl80211.c

The ath9k Kconfig conflict was a change of a Kconfig option name right
next to the deletion of another option.

The xen-netback conflict was overlapping changes involving the
handling of the notify list in xen_netbk_rx_action().

Batman conflict resolution provided by Antonio Quartulli, basically
keep everything in both conflict hunks.

The nl80211 conflict is a little more involved.  In 'net' we added a
dynamic memory allocation to nl80211_dump_wiphy() to fix a race that
Linus reported.  Meanwhile in 'net-next' the handlers were converted
to use pre and post doit handlers which use a flag to determine
whether to hold the RTNL mutex around the operation.

However, the dump handlers to not use this logic.  Instead they have
to explicitly do the locking.  There were apparent bugs in the
conversion of nl80211_dump_wiphy() in that we were not dropping the
RTNL mutex in all the return paths, and it seems we very much should
be doing so.  So I fixed that whilst handling the overlapping changes.

To simplify the initial returns, I take the RTNL mutex after we try
to allocate 'tb'.

Signed-off-by: David S. Miller

tulip: Properly check dma mapping result

2013-06-14T00:09:40+00:00

Tulip throws an error when dma debugging is enabled, as it doesn't properly
check dma mapping results with dma_mapping_error() durring tx ring refills.

Easy fix, just add it in, and drop the frame if the mapping is bad

Signed-off-by: Neil Horman 
CC: Grant Grundler 
CC: "David S. Miller" 
Reviewed-by: Grant Grundler 
Signed-off-by: David S. Miller

tulip: remove redundant D0 power state set

2013-05-31T08:39:08+00:00

pci_enable_device() will set device power state to D0,
so it's no need to do it again in tulip_init_one().

Signed-off-by: Yijing Wang 
Signed-off-by: David S. Miller

net/ethernet/dec/tulip/xircom_cb: Use module_pci_driver to register driver

2013-05-22T21:35:03+00:00

Removing some boilerplate by using module_pci_driver instead of calling
register and unregister in the otherwise empty init/exit functions.

Signed-off-by: Peter Huewe 
Reviewed-by: Grant Grundler 
Signed-off-by: David S. Miller

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

2013-03-20T16:46:26+00:00

Pull in the 'net' tree to get Daniel Borkmann's flow dissector
infrastructure change.

Signed-off-by: David S. Miller