linux-toradex.git/drivers/net/ethernet/via, branch v3.4.55 Linux kernel for Apalis and Colibri modules via-rhine: Fix bugs in NAPI support. 2013-02-14T18:49:05+00:00 David S. Miller davem@davemloft.net 2013-01-30T03:58:04+00:00 d78378096e74b2fd0b42b74156ba0ae0567ea226 [ Upstream commit 559bcac35facfed49ab4f408e162971612dcfdf3 ] 1) rhine_tx() should use dev_kfree_skb() not dev_kfree_skb_irq() 2) rhine_slow_event_task's NAPI triggering logic is racey, it should just hit the interrupt mask register. This is the same as commit 7dbb491878a2c51d372a8890fa45a8ff80358af1 ("r8169: avoid NAPI scheduling delay.") made to fix the same problem in the r8169 driver. From Francois Romieu. Reported-by: Jamie Gloudon <jamie.gloudon@gmail.com> Tested-by: Jamie Gloudon <jamie.gloudon@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
[ Upstream commit 559bcac35facfed49ab4f408e162971612dcfdf3 ]

1) rhine_tx() should use dev_kfree_skb() not dev_kfree_skb_irq()

2) rhine_slow_event_task's NAPI triggering logic is racey, it
   should just hit the interrupt mask register.  This is the
   same as commit 7dbb491878a2c51d372a8890fa45a8ff80358af1
   ("r8169: avoid NAPI scheduling delay.") made to fix the same
   problem in the r8169 driver.  From Francois Romieu.

Reported-by: Jamie Gloudon <jamie.gloudon@gmail.com>
Tested-by: Jamie Gloudon <jamie.gloudon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
via-rhine: fix wait-bit inversion. 2012-04-02T03:09:36+00:00 Andreas Mohr andi@lisas.de 2012-04-01T12:35:00+00:00 3f8c91a7398b9266fbe7abcbe4bd5dffef907643 Bug appeared in a384a33bb1c9ec2d99db2046b41f57023fa7d77b ("via-rhine: RHINE_WAIT_FOR macro removal). It can be noticed during suspend/resume. Signed-off-by: Andreas Mohr <andi@lisas.de> Acked-by: Francois Romieu <romieu@fr.zoreil.com> Cc: David Lv <DavidLv@viatech.com.cn> Signed-off-by: David S. Miller <davem@davemloft.net> 
Bug appeared in a384a33bb1c9ec2d99db2046b41f57023fa7d77b
("via-rhine: RHINE_WAIT_FOR macro removal). It can be noticed
during suspend/resume.

Signed-off-by: Andreas Mohr <andi@lisas.de>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: David Lv <DavidLv@viatech.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
net: replace random_ether_addr() with eth_hw_addr_random() 2012-02-15T20:34:16+00:00 Danny Kukawka danny.kukawka@bisect.de 2012-02-15T06:45:39+00:00 f2cedb63df14342ad40a8b5b324fc5d94a60b665 Replace usage of random_ether_addr() with eth_hw_addr_random() to set addr_assign_type correctly to NET_ADDR_RANDOM. Change the trivial cases. 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> 
Replace usage of random_ether_addr() with eth_hw_addr_random()
to set addr_assign_type correctly to NET_ADDR_RANDOM.

Change the trivial cases.

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>
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-11T04:32:28+00:00 David S. Miller davem@davemloft.net 2012-02-11T04:32:28+00:00 d5ef8a4d87ab21d575ac86366599c9152a28028d Conflicts: drivers/infiniband/hw/nes/nes_cm.c Simple whitespace conflict. Signed-off-by: David S. Miller <davem@davemloft.net> 
Conflicts:
	drivers/infiniband/hw/nes/nes_cm.c

Simple whitespace conflict.

Signed-off-by: David S. Miller <davem@davemloft.net>
netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-08T23:46:38+00:00 Pradeep A. Dalvi netdev@pradeepdalvi.com 2012-02-06T11:16:13+00:00 dae2e9f430c46c29e3f771110094bd3da3625aa4 Replaced deprecating dev_alloc_skb with netdev_alloc_skb in drivers/net/ethernet - Removed extra skb->dev = dev after netdev_alloc_skb Signed-off-by: Pradeep A Dalvi <netdev@pradeepdalvi.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Replaced deprecating dev_alloc_skb with netdev_alloc_skb in drivers/net/ethernet
  - Removed extra skb->dev = dev after netdev_alloc_skb

Signed-off-by: Pradeep A Dalvi <netdev@pradeepdalvi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
via-velocity: S3 resume fix. 2012-02-05T22:47:09+00:00 David Lv DavidLv@viatech.com.cn 2012-02-04T23:22:26+00:00 b530b1930bbd9d005345133f0ff0c556d2a52b19 Initially diagnosed on Ubuntu 11.04 with kernel 2.6.38. velocity_close is not called during a suspend / resume cycle in this driver and it has no business playing directly with power states. Signed-off-by: David Lv <DavidLv@viatech.com.cn> Acked-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Initially diagnosed on Ubuntu 11.04 with kernel 2.6.38.

velocity_close is not called during a suspend / resume cycle in this
driver and it has no business playing directly with power states.

Signed-off-by: David Lv <DavidLv@viatech.com.cn>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net: Remove alloc_etherdev error messages 2012-01-31T21:20:48+00:00 Joe Perches joe@perches.com 2012-01-29T13:47:52+00:00 41de8d4cff21a2e81e3d9ff66f5f7c903f9c3ab1 alloc_etherdev has a generic OOM/unable to alloc message. Remove the duplicative messages after alloc_etherdev calls. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
alloc_etherdev has a generic OOM/unable to alloc message.
Remove the duplicative messages after alloc_etherdev calls.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
via-rhine: rework suspend and resume. 2012-01-07T22:02:38+00:00 Francois Romieu romieu@fr.zoreil.com 2012-01-07T21:58:27+00:00 e92b9b3b091d5fcdaed91d6fa9410deae135704b Cover of 861ab44059350e5cab350238606cf8814abab93b. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> 
Cover of 861ab44059350e5cab350238606cf8814abab93b.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
via-rhine: per device debug level. 2012-01-07T22:02:38+00:00 Francois Romieu romieu@fr.zoreil.com 2012-01-07T21:39:37+00:00 fc3e0f8aec05dd812cba2c1e31c3d1f5fc85e55c Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> 
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
via-rhine: RHINE_WAIT_FOR macro removal. 2012-01-07T22:02:37+00:00 Francois Romieu romieu@fr.zoreil.com 2012-01-07T21:19:36+00:00 a384a33bb1c9ec2d99db2046b41f57023fa7d77b Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> 
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>