kernel.git/drivers/net/ethernet/atheros, branch linux-3.7.y

sections: fix section conflicts in drivers/net

2012-10-05T18:04:42Z

Signed-off-by: Andi Kleen Cc: David Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

Merge branch 'pci/stephen-const' into next

2012-09-12T19:54:10Z

* pci/stephen-const: make drivers with pci error handlers const scsi: make pci error handlers const netdev: make pci_error_handlers const PCI: Make pci_error_handlers const

netdev: make pci_error_handlers const

2012-09-07T22:35:00Z

Signed-off-by: Stephen Hemminger Signed-off-by: Bjorn Helgaas

atl1c: Use PCI Express Capability accessors

2012-08-23T16:11:14Z

Use PCI Express Capability access functions to simplify atl1c driver. Signed-off-by: Jiang Liu Signed-off-by: Bjorn Helgaas

atl1c: fix issue of io access mode for AR8152 v2.1

2012-07-20T18:21:18Z

When io access mode is enabled by BOOTROM or BIOS for AR8152 v2.1, the register can't be read/write by memory access mode. Clearing Bit 8 of Register 0x21c could fixed the issue. Signed-off-by: Cloud Ren Cc: stable Signed-off-by: xiong Signed-off-by: David S. Miller

ethernet: Use eth_random_addr

2012-07-17T05:38:27Z

Convert the existing uses of random_ether_addr to the new eth_random_addr. Signed-off-by: Joe Perches Signed-off-by: David S. Miller

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

2012-07-11T06:56:33Z

Conflicts: net/batman-adv/bridge_loop_avoidance.c net/batman-adv/bridge_loop_avoidance.h net/batman-adv/soft-interface.c net/mac80211/mlme.c With merge help from Antonio Quartulli (batman-adv) and Stephen Rothwell (drivers/net/usb/qmi_wwan.c). The net/mac80211/mlme.c conflict seemed easy enough, accounting for a conversion to some new tracing macros. Signed-off-by: David S. Miller

drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions

2012-07-11T06:13:46Z

Fix incorrect start markers, wrapped summary lines, missing section breaks, incorrect separators, and some name mismatches. Delete a few that are content-free. Signed-off-by: Ben Hutchings Acked-by: Jeff Kirsher Signed-off-by: David S. Miller

atl1c: fix issue of transmit queue 0 timed out

2012-07-09T06:59:53Z

some people report atl1c could cause system hang with following kernel trace info: --------------------------------------- WARNING: at.../net/sched/sch_generic.c:258 dev_watchdog+0x1db/0x1d0() ... NETDEV WATCHDOG: eth0 (atl1c): transmit queue 0 timed out ... --------------------------------------- This is caused by netif_stop_queue calling when cable Link is down. So remove netif_stop_queue, because link_watch will take it over. Signed-off-by: xiong Cc: stable Signed-off-by: Cloud Ren Signed-off-by: David S. Miller

ethernet: Remove casts to same type

2012-06-06T16:31:33Z

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