Re: [PATCH] staging: et131x: let the freeing of memory more reasonable in error path

2014-02-21 Thread Zhao, Gang
On Fri, 2014-02-21 at 15:38:56 +0800, Dan Carpenter wrote: I don't think this is the right thing because it is needless code. Overall it doesn't really simplify anything. You are worried that reviewers will be confused and think there is a leak in et131x_rx_dma_memory_alloc() and then add a

Re: [PATCH] staging: et131x: let the freeing of memory more reasonable in error path

2014-02-21 Thread Zhao, Gang
On Fri, 2014-02-21 at 20:35:50 +0800, Dan Carpenter wrote: On Fri, Feb 21, 2014 at 08:22:21PM +0800, Zhao, Gang wrote: If we add your patch and the reviewer does a search for fb[0] then it is confusing what the right thing to do is. My fault. I should remove that two lines of code

Re: [PATCH] et131x: fix allocation failures

2014-02-20 Thread Zhao, Gang
On Thu, 2014-02-20 at 17:03:39 +0800, Dan Carpenter wrote: On Thu, Feb 20, 2014 at 11:03:45AM +0800, Zhao, Gang wrote: On Wed, 2014-02-19 at 19:43:15 +0800, One Thousand Gnomes wrote: On Wed, 19 Feb 2014 09:14:19 +0800 Zhao\, Gang gamer...@gmail.com wrote: Alan, thanks for resending

[PATCH] staging: et131x: let the freeing of memory more reasonable in error path

2014-02-20 Thread Zhao, Gang
correctly. Signed-off-by: Zhao, Gang gamer...@gmail.com --- I didn't notice Alan's et131x patch on the list have been applied. Now combine my comments on that patch to a new patch for review. drivers/staging/et131x/et131x.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers

Re: [PATCH] et131x: fix allocation failures

2014-02-19 Thread Zhao, Gang
On Wed, 2014-02-19 at 19:43:15 +0800, One Thousand Gnomes wrote: On Wed, 19 Feb 2014 09:14:19 +0800 Zhao\, Gang gamer...@gmail.com wrote: Alan, thanks for resending this patch. But it seems you overlooked something we discussed earlier. On Mon, 2014-02-17 at 22:13:08 +0800, Alan wrote

[PATCH] staging: wlan-ng: replace function ieee80211_dsss_chan_to_freq()

2014-02-18 Thread Zhao, Gang
is defined / declared in net/cfg80211.h. So this change is safe. This change is a preparation for the removal of function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}. Signed-off-by: Zhao, Gang gamer...@gmail.com --- add Cc to linux-wireless for consistency. drivers/staging/wlan-ng/cfg80211.c

Re: [PATCH] et131x: fix allocation failures

2014-02-18 Thread Zhao, Gang
Alan, thanks for resending this patch. But it seems you overlooked something we discussed earlier. On Mon, 2014-02-17 at 22:13:08 +0800, Alan wrote: We should check the ring allocations don't fail. If we get a fail we need to clean up properly. The allocator assumes the deallocator will be

Re: [PATCH 02/13] staging: r8188eu: Remove pointless alignment entry in recv_frame

2014-02-15 Thread Zhao, Gang
On Sat, 2014-02-15 at 06:54:06 +0800, Larry Finger wrote: This alignment entry in union recv_frame does nothing. It certainly dues not ensure alignment. ^ typo here. I accidently sent this as a private mail before, better to resend to the list. Suggested-by:

Re: [PATCH] et131x: fix allocation failures

2014-02-05 Thread Zhao, Gang
add Cc to devel mailing list On Wed, 2014-02-05 at 19:56:19 +0800, Alan wrote: We should check the ring allocations don't fail. If we get a fail we need to clean up properly. The allocator assumes the deallocator will be used on failure, but it isn't. Fix this and add a missing check against

[PATCH RESEND 1/3] staging: et131x: stop read when hit max delay in et131x_phy_mii_read

2014-02-05 Thread Zhao, Gang
stop read and return error when hit max delay time. Signed-off-by: Zhao, Gang gamer...@gmail.com Acked-by: Mark Einon mark.ei...@gmail.com --- Acked at post: http://article.gmane.org/gmane.linux.kernel/1599347 drivers/staging/et131x/et131x.c | 2 ++ 1 file changed, 2 insertions(+) diff --git

[PATCH RESEND 2/3] staging: et131x: remove spinlock adapter-lock

2014-02-05 Thread Zhao, Gang
adapter-lock is only used in et131x_multicast(), which is eventually called by network stack function __dev_set_rx_mode(). __dev_set_rx_mode() is always called by (net_device *)dev-addr_list_lock hold, to protect from concurrent access. So adapter-lock is redundant. Signed-off-by: Zhao, Gang

[PATCH RESEND 3/3] staging: et131x: fix make W=1 build warning

2014-02-05 Thread Zhao, Gang
but not used [-Wunused-but-set-variable] u32 pm_csr; ^ Signed-off-by: Zhao, Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 7 --- 1 file changed, 7 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 6413500..0c44014 100644

[PATCH v3 3/7] staging: et131x: reduce split lines in et131x_rx_dma_memory_free

2013-12-09 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 32 +--- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 9272548..5a45465 100644 --- a/drivers

[PATCH v3 2/7] staging: et131x: reduce split lines in et131x_rx_dma_memory_alloc

2013-12-09 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 48 - 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index d16ac57..9272548 100644

[PATCH v3 1/7] staging: et131x: reduce split lines in et131x_config_rx_dma_regs

2013-12-09 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 24 ++-- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 5dd2170..d16ac57 100644 --- a/drivers/staging

[PATCH v3 7/7] staging: et131x: remove unnecessary pointer typecast

2013-12-09 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 22 ++ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 89bd8ca..fdb19df 100644 --- a/drivers/staging/et131x

[PATCH v3 6/7] staging: et131x: remove item that have been done in TODO file

2013-12-09 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/README | 4 1 file changed, 4 deletions(-) diff --git a/drivers/staging/et131x/README b/drivers/staging/et131x/README index 8da96a6..3befc45 100644 --- a/drivers/staging/et131x/README +++ b/drivers/staging/et131x/README

Re: [PATCH v3 1/7] staging: et131x: reduce split lines in et131x_config_rx_dma_regs

2013-12-09 Thread ZHAO Gang
On Mon, Dec 9, 2013 at 4:53 PM, Greg Kroah-Hartman gre...@linuxfoundation.org wrote: On Mon, Dec 09, 2013 at 04:46:08PM +0800, ZHAO Gang wrote: Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 24 ++-- 1 file changed, 10 insertions(+), 14

[PATCH v4 2/7] staging: et131x: reduce split lines in et131x_rx_dma_memory_alloc

2013-12-09 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com Acked-by: Mark Einon mark.ei...@gmail.com --- drivers/staging/et131x/et131x.c | 48 - 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x

[PATCH v4 1/7] staging: et131x: reduce split lines in et131x_config_rx_dma_regs

2013-12-09 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com Acked-by: Mark Einon mark.ei...@gmail.com --- drivers/staging/et131x/et131x.c | 24 ++-- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 5dd2170

[PATCH v4 4/7] staging: et131x: reduce split lines in nic_return_rfd

2013-12-09 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 5a45465..f498eec 100644 --- a/drivers/staging/et131x

[PATCH v4 6/7] staging: et131x: remove item that have been done in TODO file

2013-12-09 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/README | 4 1 file changed, 4 deletions(-) diff --git a/drivers/staging/et131x/README b/drivers/staging/et131x/README index 8da96a6..3befc45 100644 --- a/drivers/staging/et131x/README +++ b/drivers/staging/et131x/README

[PATCH v4 5/7] staging: et131x: reduce split lines in nic_rx_pkts

2013-12-09 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com Acked-by: Mark Einon mark.ei...@gmail.com --- drivers/staging/et131x/et131x.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index f498eec..89bd8ca 100644

[PATCH v4 7/7] staging: et131x: remove unnecessary pointer typecast

2013-12-09 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com Acked-by: Mark Einon mark.ei...@gmail.com --- drivers/staging/et131x/et131x.c | 22 ++ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 89bd8ca

[PATCH v4 3/7] staging: et131x: reduce split lines in et131x_rx_dma_memory_free

2013-12-09 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com Acked-by: Mark Einon mark.ei...@gmail.com --- drivers/staging/et131x/et131x.c | 32 +--- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index

[PATCH 1/7 v2] staging: et131x: reduce split lines in et131x_config_rx_dma_regs

2013-12-07 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 24 ++-- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index e3a71d3..f86e713 100644 --- a/drivers/staging

[PATCH 4/7 v2] staging: et131x: reduce split lines in nic_return_rfd

2013-12-07 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index f925ce6..5c431c3 100644 --- a/drivers/staging/et131x

[PATCH 3/7] staging: et131x: reduce split lines in et131x_rx_dma_memory_free

2013-12-06 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 33 + 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 17ac711..b6ce68e 100644 --- a/drivers

[PATCH 5/7] staging: et131x: reduce split lines in nic_rx_pkts

2013-12-06 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 3e34c2e..8d75a3f 100644 --- a/drivers/staging/et131x/et131x.c

[PATCH 1/7] staging: et131x: reduce split lines in et131x_config_rx_dma_regs

2013-12-06 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 26 -- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index e3a71d3..ee231f2 100644 --- a/drivers/staging

[PATCH 1/7 RESEND] staging: et131x: reduce split lines in et131x_config_rx_dma_regs

2013-12-06 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 25 +++-- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index e3a71d3..0372f23 100644 --- a/drivers/staging

[PATCH 3/7 RESEND] staging: et131x: reduce split lines in et131x_rx_dma_memory_free

2013-12-06 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 32 +--- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 63d28ae..881ae4f 100644 --- a/drivers

[PATCH 4/7 RESEND] staging: et131x: reduce split lines in nic_return_rfd

2013-12-06 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 23 --- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 881ae4f..90ef45b 100644 --- a/drivers/staging

Re: [PATCH 34/39] vme: remove DEFINE_PCI_DEVICE_TABLE macro

2013-12-05 Thread ZHAO Gang
On Tue, Dec 3, 2013 at 7:29 AM, Jingoo Han jg1@samsung.com wrote: Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro is not preferred. Signed-off-by: Jingoo Han jg1@samsung.com --- Greg, this patch should be reverted. It do the opposite things.

Re: [PATCH 28/39] staging: remove DEFINE_PCI_DEVICE_TABLE macro

2013-12-05 Thread ZHAO Gang
On Tue, Dec 3, 2013 at 7:26 AM, Jingoo Han jg1@samsung.com wrote: Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro is not preferred. Signed-off-by: Jingoo Han jg1@samsung.com I think you misunderstood the checkpatch.pl warning, it tells you what to do, not what not to do.

Re: [PATCH 28/39] staging: remove DEFINE_PCI_DEVICE_TABLE macro

2013-12-05 Thread ZHAO Gang
On Thu, Dec 5, 2013 at 11:43 PM, Greg Kroah-Hartman gre...@linuxfoundation.org wrote: On Thu, Dec 05, 2013 at 05:06:33PM +0800, ZHAO Gang wrote: On Tue, Dec 3, 2013 at 7:26 AM, Jingoo Han jg1@samsung.com wrote: Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro is not preferred

Re: [PATCH 08/11] staging: et131x: simplify rx dma code

2013-12-04 Thread ZHAO Gang
On Wed, Dec 4, 2013 at 5:05 PM, Mark Einon mark.ei...@gmail.com wrote: On Wed, Dec 04, 2013 at 03:24:18PM +0800, ZHAO Gang wrote: The original code allocate rx dma memory in several dma_alloc_coherent calls, which causes some problems: 1. since dma_alloc_coherent allocate at least one page

Re: [PATCH 08/11] staging: et131x: simplify rx dma code

2013-12-04 Thread ZHAO Gang
On Wed, Dec 4, 2013 at 8:01 PM, ZHAO Gang gamer...@gmail.com wrote: On Wed, Dec 4, 2013 at 5:05 PM, Mark Einon mark.ei...@gmail.com wrote: On Wed, Dec 04, 2013 at 03:24:18PM +0800, ZHAO Gang wrote: The original code allocate rx dma memory in several dma_alloc_coherent calls, which causes

Re: [PATCH 04/11] staging: et131x: drop packet when error occurs in et131x_tx

2013-12-04 Thread ZHAO Gang
On Thu, Dec 5, 2013 at 7:23 AM, Greg Kroah-Hartman gre...@linuxfoundation.org wrote: On Wed, Dec 04, 2013 at 03:24:14PM +0800, ZHAO Gang wrote: As TODO file suggested, drop packet instead of return NETDEV_TX_BUSY when tx failed. Really? That's ok to do? Seems like you are changing the logic

Re: [PATCH 08/11] staging: et131x: simplify rx dma code

2013-12-04 Thread ZHAO Gang
On Wed, Dec 4, 2013 at 10:53 PM, Mark Einon mark.ei...@gmail.com wrote: On Wed, Dec 04, 2013 at 09:32:27PM +0800, ZHAO Gang wrote: By re-examine the code I found the calculation is not correct. The real impact is too big to apply this patch, so this patch and following patches should

[PATCH v5 6/7 RESEND] staging: et131x: remove spinlock adapter-lock

2013-12-03 Thread ZHAO Gang
adapter-lock is only used in et131x_multicast(), which is eventually called by network stack function __dev_set_rx_mode(). __dev_set_rx_mode() is always called by (net_device *)dev-addr_list_lock hold, to protect from concurrent access. So adapter-lock is redundant. Signed-off-by: ZHAO Gang gamer

Re: [PATCH v5 1/7] staging: et131x: make some tweaks to reduce split lines

2013-12-03 Thread ZHAO Gang
On Wed, Dec 4, 2013 at 3:09 PM, Greg Kroah-Hartman gre...@linuxfoundation.org wrote: On Wed, Dec 04, 2013 at 01:51:41PM +0800, ZHAO Gang wrote: On Wed, Dec 4, 2013 at 12:38 AM, Greg Kroah-Hartman gre...@linuxfoundation.org wrote: On Sat, Nov 23, 2013 at 12:21:29AM +0800, ZHAO Gang wrote: 1

[PATCH v2 3/4 RESEND] staging: et131x: fix build warning

2013-12-03 Thread ZHAO Gang
but not used [-Wunused-but-set-variable] u32 pm_csr; ^ Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 6 -- 1 file changed, 6 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 3fa1763..65fa0ed

[PATCH 02/11] staging: et131x: change function name

2013-12-03 Thread ZHAO Gang
Change function name from et1310_phy_power_down to et1310_phy_power_switch to better describe its functionality. Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/et131x

[PATCH 04/11] staging: et131x: drop packet when error occurs in et131x_tx

2013-12-03 Thread ZHAO Gang
As TODO file suggested, drop packet instead of return NETDEV_TX_BUSY when tx failed. et131x_tx calls function et131x_send_packets, I put the work of et131x_send_packets directly into et131x_tx, and made some changes to let the code more readable. Signed-off-by: ZHAO Gang gamer...@gmail.com

[PATCH 09/11] staging: et131x: simplify tx dma code

2013-12-03 Thread ZHAO Gang
combine two dma_alloc_coherent to one Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 70 +++-- 1 file changed, 19 insertions(+), 51 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c

[PATCH 08/11] staging: et131x: simplify rx dma code

2013-12-03 Thread ZHAO Gang
as et131x_rx_dma_memory_alloc Instead, allocate all rx dma memory in one dma_alloc_coherent call makes less code, makes it easy to handle dma allocation error, and makes et131x_rx_dma_memory_free as simple as it could be. Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c

[PATCH 01/11] staging: et131x: make some tweaks to reduce split lines

2013-12-03 Thread ZHAO Gang
1. As TODO list suggested, do this sort of things to reduce split lines: struct fbr_lookup *fbr; fbr = rx_local-fbr[id]; Then replace all the instances of rx_local-fbr[id] with fbr. 2. Some code style change Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging

[PATCH 11/11] staging: et131x: some code style change

2013-12-03 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 65fa0ed..772d299 100644 --- a/drivers/staging/et131x/et131x.c

[PATCH 10/11] staging: et131x: fix build warning

2013-12-03 Thread ZHAO Gang
but not used [-Wunused-but-set-variable] u32 pm_csr; ^ Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 6 -- 1 file changed, 6 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 3fa1763..65fa0ed

[PATCH 03/11] staging: et131x: delete unnecessary variable in function et131x_init

2013-12-03 Thread ZHAO Gang
Variable u32 numrfd is not necessary in this function. Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 263a478..f4ab56a

[PATCH 07/11] staging: et131x: update TODO list

2013-12-03 Thread ZHAO Gang
remove items that have been done Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/README | 5 - 1 file changed, 5 deletions(-) diff --git a/drivers/staging/et131x/README b/drivers/staging/et131x/README index 8da96a6..00a34ea 100644 --- a/drivers/staging/et131x/README

[PATCH 06/11] staging: et131x: remove spinlock adapter-lock

2013-12-03 Thread ZHAO Gang
adapter-lock is only used in et131x_multicast(), which is eventually called by network stack function __dev_set_rx_mode(). __dev_set_rx_mode() is always called by (net_device *)dev-addr_list_lock hold, to protect from concurrent access. So adapter-lock is redundant. Signed-off-by: ZHAO Gang gamer

[PATCH 05/11] staging: et131x: stop read when hit max delay in et131x_phy_mii_read

2013-12-03 Thread ZHAO Gang
stop read and return error when hit max delay time. Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 6441e25..0fe7b17 100644 --- a/drivers

Re: [PATCH v2 1/4] staging: et131x: simplify rx dma code

2013-11-28 Thread ZHAO Gang
On Thu, Nov 28, 2013 at 3:58 PM, Dan Carpenter dan.carpen...@oracle.com wrote: On Thu, Nov 28, 2013 at 12:53:39AM +0800, ZHAO Gang wrote: @@ -2208,8 +2203,11 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter) rx_ring = adapter-rx_ring; /* Alloc memory

[PATCH v2 1/4 RESEND] staging: et131x: simplify rx dma code

2013-11-28 Thread ZHAO Gang
as et131x_rx_dma_memory_alloc Instead, allocate all rx dma memory in one dma_alloc_coherent call makes less code, makes it easy to handle dma allocation error, and makes et131x_rx_dma_memory_free as simple as it could be. Also add error check to kmalloc. Signed-off-by: ZHAO Gang gamer...@gmail.com

Re: [PATCH 1/3] staging: et131x: simplify rx dma code

2013-11-27 Thread ZHAO Gang
On Wed, Nov 27, 2013 at 5:02 PM, Dan Carpenter dan.carpen...@oracle.com wrote: On Wed, Nov 27, 2013 at 03:45:12PM +0800, ZHAO Gang wrote: @@ -2208,8 +2204,11 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter) rx_ring = adapter-rx_ring; /* Alloc memory

Re: [PATCH 1/3] staging: et131x: simplify rx dma code

2013-11-27 Thread ZHAO Gang
On Wed, Nov 27, 2013 at 6:06 PM, Dan Carpenter dan.carpen...@oracle.com wrote: Ok, yeah. This patch is the right thing. I had a couple minor style complaints. I am happy to hear this. On Wed, Nov 27, 2013 at 03:45:12PM +0800, ZHAO Gang wrote: The original code allocate rx dma memory

Re: [PATCH 1/3] staging: et131x: simplify rx dma code

2013-11-27 Thread ZHAO Gang
On Wed, Nov 27, 2013 at 8:04 PM, Dan Carpenter dan.carpen...@oracle.com wrote: On Wed, Nov 27, 2013 at 07:37:30PM +0800, ZHAO Gang wrote: On Wed, Nov 27, 2013 at 5:02 PM, Dan Carpenter dan.carpen...@oracle.com wrote: On Wed, Nov 27, 2013 at 03:45:12PM +0800, ZHAO Gang wrote: @@ -2208,8

Re: [PATCH 3/3] staging: et131x: fix build warning

2013-11-27 Thread ZHAO Gang
On Wed, Nov 27, 2013 at 6:13 PM, Dan Carpenter dan.carpen...@oracle.com wrote: On Wed, Nov 27, 2013 at 03:45:14PM +0800, ZHAO Gang wrote: fix make -W1 warning: drivers/staging/et131x//et131x.c: In function ‘et1310_setup_device_for_multicast’: drivers/staging/et131x//et131x.c:1055:6: warning

Re: [PATCH 1/3] staging: et131x: simplify rx dma code

2013-11-27 Thread ZHAO Gang
On Wed, Nov 27, 2013 at 9:26 PM, Dan Carpenter dan.carpen...@oracle.com wrote: On Wed, Nov 27, 2013 at 08:43:57PM +0800, ZHAO Gang wrote: + /* Update the pointer */ + dma_addr += fbr-buffsize; Do the virt_addr update here as well

[PATCH v2 2/4] staging: et131x: simplify tx dma code

2013-11-27 Thread ZHAO Gang
combine two dma_alloc_coherent to one Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 70 +++-- 1 file changed, 19 insertions(+), 51 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c

[PATCH v2 0/4] staging: et131x: patches for et131x driver

2013-11-27 Thread ZHAO Gang
et131x_rx_dma_memory_free: they only need to call one kfree instead of two, it reduces the lines of code. ZHAO Gang (4): staging: et131x: simplify rx dma code staging: et131x: simplify tx dma code staging: et131x: fix build warning staging: et131x: some code style change drivers/staging/et131x/et131x.c | 290

[PATCH v2 1/4] staging: et131x: simplify rx dma code

2013-11-27 Thread ZHAO Gang
as et131x_rx_dma_memory_alloc Instead, allocate all rx dma memory in one dma_alloc_coherent call makes less code, makes it easy to handle dma allocation error, and makes et131x_rx_dma_memory_free as simple as it could be. Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c

[PATCH v2 4/4] staging: et131x: some code style change

2013-11-27 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 7305fb5..764f7d0 100644 --- a/drivers/staging/et131x/et131x.c

[PATCH v2 3/4] staging: et131x: fix build warning

2013-11-27 Thread ZHAO Gang
but not used [-Wunused-but-set-variable] u32 pm_csr; ^ drivers/staging/et131x//et131x.c: In function ‘et131x_multicast’: drivers/staging/et131x//et131x.c:4315:16: warning: unused variable ‘flags’ [-Wunused-variable] unsigned long flags; ^ Signed-off-by: ZHAO Gang

[PATCH v2 4/4 resent] staging: et131x: some code style change

2013-11-27 Thread ZHAO Gang
Signed-off-by: ZHAO Gang gamer...@gmail.com --- I now see the good point of separating code style changes from others. If your code is right, just edit code style change patch until reviewers are satisfied :-) drivers/staging/et131x/et131x.c | 14 +- 1 file changed, 5 insertions

[PATCH 0/3] staging: et131x: patches for et131x

2013-11-26 Thread ZHAO Gang
This patch set is based on previous sent v5 of 7 patches for et131x. ZHAO Gang (3): staging: et131x: simplify rx dma code staging: et131x: simplify tx dma code staging: et131x: fix build warning drivers/staging/et131x/et131x.c | 298 +--- 1 file changed

[PATCH 2/3] staging: et131x: simplify tx dma code

2013-11-26 Thread ZHAO Gang
combine two dma_alloc_coherent to one Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 72 - 1 file changed, 20 insertions(+), 52 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c

[PATCH 3/3] staging: et131x: fix build warning

2013-11-26 Thread ZHAO Gang
but not used [-Wunused-but-set-variable] u32 pm_csr; ^ drivers/staging/et131x//et131x.c: In function ‘et131x_multicast’: drivers/staging/et131x//et131x.c:4315:16: warning: unused variable ‘flags’ [-Wunused-variable] unsigned long flags; ^ Signed-off-by: ZHAO Gang

Re: [PATCH v4 1/5] staging: et131x: clean up code

2013-11-22 Thread ZHAO Gang
On Fri, Nov 22, 2013 at 5:00 PM, Dan Carpenter dan.carpen...@oracle.com wrote: On Fri, Nov 22, 2013 at 04:44:48PM +0800, ZHAO Gang wrote: Otherwise this patch seems nice but it needs to be split up and resent. By the way, this mailing list is surely an open list, but I can't find how

Re: [PATCH v3 2/5] staging: et131x: drop packet when error occurs in et131x_tx

2013-11-22 Thread ZHAO Gang
On Fri, Nov 22, 2013 at 5:17 PM, Denis Kirjanov kirja...@gmail.com wrote: On 11/22/13, Mark Einon mark.ei...@gmail.com wrote: On Wed, Nov 20, 2013 at 03:55:27PM +0800, ZHAO Gang wrote: As TODO file suggested, drop packet instead of return NETDEV_TX_BUSY when tx failed. et131x_tx calls

Re: [PATCH v3 2/5] staging: et131x: drop packet when error occurs in et131x_tx

2013-11-22 Thread ZHAO Gang
On Fri, Nov 22, 2013 at 7:56 PM, Denis Kirjanov kirja...@gmail.com wrote: If you have no free TX descriptors that means that something went wrong and it's a BUG. You have to tell the stack to stop sending packets using netif_stop_queue() and reenable transmissions once tx descriptors will be

Re: [PATCH v4 1/5] staging: et131x: clean up code

2013-11-22 Thread ZHAO Gang
On Fri, Nov 22, 2013 at 8:13 PM, Dan Carpenter dan.carpen...@oracle.com wrote: On Fri, Nov 22, 2013 at 07:37:58PM +0800, ZHAO Gang wrote: On Fri, Nov 22, 2013 at 5:00 PM, Dan Carpenter dan.carpen...@oracle.com wrote: On Fri, Nov 22, 2013 at 04:44:48PM +0800, ZHAO Gang wrote: Otherwise

[PATCH v5 1/7] staging: et131x: make some tweaks to reduce split lines

2013-11-22 Thread ZHAO Gang
1. As TODO list suggested, do this sort of things to reduce split lines: struct fbr_lookup *fbr; fbr = rx_local-fbr[id]; Then replace all the instances of rx_local-fbr[id] with fbr. 2. Some code style changes Signed-off-by: ZHAO Gang gamer...@gmail.com --- v4 - v5: split

[PATCH v5 3/7] staging: et131x: delete unnecessary variable in function et131x_init

2013-11-22 Thread ZHAO Gang
Variable u32 numrfd is not necessary in this function. Signed-off-by: ZHAO Gang gamer...@gmail.com --- drivers/staging/et131x/et131x.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 0a6cc62..6df7145

[PATCH v5 4/7] staging: et131x: drop packet when error occurs in et131x_tx

2013-11-22 Thread ZHAO Gang
As TODO file suggested, drop packet instead of return NETDEV_TX_BUSY when tx failed. et131x_tx calls function et131x_send_packets, I put the work of et131x_send_packets directly into et131x_tx, and made some changes to let the code more readable. Signed-off-by: ZHAO Gang gamer...@gmail.com

[PATCH v5 6/7] staging: et131x: remove spinlock adapter-lock

2013-11-22 Thread ZHAO Gang
adapter-lock is only used in et131x_multicast(), which is eventually called by network stack function __dev_set_rx_mode(). __dev_set_rx_mode() is always called by (net_device *)dev-addr_list_lock hold, to protect from concurrent access. So adapter-lock is redundant. Signed-off-by: ZHAO Gang gamer

[PATCH v4 1/5] staging: et131x: clean up code

2013-11-21 Thread ZHAO Gang
all the instances of rx_local-fbr[id] with fbr. 3. delete unnecessary variable in function et131x_init variable u32 numrfd is not necessary in this function. 4. some code style change Signed-off-by: ZHAO Gang gamer...@gmail.com --- v3 - v4: don't split dev_err strings keep

Re: [PATCH v3 5/5] staging: et131x: update TODO list

2013-11-21 Thread ZHAO Gang
On Fri, Nov 22, 2013 at 5:20 AM, Mark Einon mark.ei...@gmail.com wrote: On Wed, Nov 20, 2013 at 03:58:37PM +0800, ZHAO Gang wrote: remove items that have been done Signed-off-by: ZHAO Gang gamer...@gmail.com If the two small issues in patch 1/5 are fixed: Fixed in v4 of patch 1/5 I sent