Danny Kukawka
7ce5d22219
net: use eth_hw_addr_random() and reset addr_assign_type
...
Use eth_hw_addr_random() instead of calling random_ether_addr()
to set addr_assign_type correctly to NET_ADDR_RANDOM.
Reset the state to NET_ADDR_PERM as soon as the MAC get
changed via .ndo_set_mac_address.
v2: adapt to renamed eth_hw_addr_random()
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de >
Signed-off-by: David S. Miller <davem@davemloft.net >
2012-02-15 15:34:17 -05:00
Linus Torvalds
57f2685c16
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
...
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
ARM: mach-shmobile: specify CHCLR registers on SH7372
dma: shdma: fix runtime PM: clear channel buffers on reset
dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
dmaengine/ste_dma40: clear LNK on channel startup
dmaengine: intel_mid_dma: remove legacy pm interface
ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
dmaengine: intel_mid_dma: error path fix
dmaengine: intel_mid_dma: locking and freeing fixes
mtd: gpmi-nand: move to dma_transfer_direction
mtd: fix compile error for gpmi-nand
mmc: mxs-mmc: fix the dma_transfer_direction migration
dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
dma: mxs-dma: fix a typo in comment
DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
video i.MX IPU: Fix display connections
i.MX IPU DMA: Fix wrong burstsize settings
dmaengine/ste_dma40: allow fixed physical channel
...
Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}
The conflicts looked pretty trivial, but I'll ask people to verify them.
2012-01-17 18:40:24 -08:00
Axel Lin
db62f684de
net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver()
...
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" <davem@davemloft.net >
Cc: Pantelis Antoniou <pantelis.antoniou@gmail.com >
Cc: Vitaly Bordug <vbordug@ru.mvista.com >
Cc: Wan ZongShun <mcuos.com@gmail.com >
Cc: Nicolas Pitre <nico@fluxnic.net >
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com >
Cc: Marc Kleine-Budde <mkl@pengutronix.de >
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com >
Cc: Jiri Pirko <jpirko@redhat.com >
Cc: Daniel Hellstrom <daniel@gaisler.com >
Cc: Alexey Dobriyan <adobriyan@gmail.com >
Cc: Tobias Klauser <tklauser@distanz.ch >
Cc: Grant Likely <grant.likely@secretlab.ca >
Cc: Jiri Kosina <jkosina@suse.cz >
Cc: Richard Cochran <richard.cochran@omicron.at >
Cc: Jonas Bonn <jonas@southpole.se >
Cc: Sebastian Poehn <sebastian.poehn@belden.com >
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com >
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl >
Signed-off-by: Axel Lin <axel.lin@gmail.com >
Acked-by: Wan ZongShun <mcuos.com@gmail.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
2011-11-29 00:25:05 -05:00
Vinod Koul
e0d23ef29e
Merge branch 'dma_slave_direction' into next_test_dirn
...
resolved conflicts:
drivers/media/video/mx3_camera.c
2011-11-17 14:54:57 +05:30
Jeff Kirsher
bcc9736c6c
ks8*/ksz8*: Move the Micrel drivers
...
Move the Micrel drivers into drivers/net/ethernet/micrel/ and
make the necessary Kconfig and Makefile changes.
CC: Ben Dooks <ben@simtec.co.uk >
CC: Tristram Ha <Tristram.Ha@micrel.com >
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com >
2011-08-12 00:22:18 -07:00
