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

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.

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

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

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

_free() can handle this situation correctly. Signed-off-by: Zhao, Gang --- 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(+),

Re: [PATCH] et131x: fix allocation failures

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" wrote: >&

Re: [PATCH] et131x: fix allocation failures

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" wrote: > >> Alan, thanks for resending this patch. But it seems you overlooked >> something we discussed earlier. >> >> On Mon, 2014-0

Re: [PATCH] et131x: fix allocation failures

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 u

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

/ declared in . 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 --- add Cc to linux-wireless for consistency. drivers/staging/wlan-ng/cfg80211.c | 7 +-- 1 file changed, 5 insertions

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

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: jes.soren...@redha

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

Mark, could you look at this patch? It has not been acked. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

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

not used [-Wunused-but-set-variable] u32 pm_csr; ^ Signed-off-by: Zhao, Gang --- 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 --- a/drivers

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

stop read and return error when hit max delay time. Signed-off-by: Zhao, Gang Acked-by: Mark Einon --- Acked at post: http://article.gmane.org/gmane.linux.kernel/1599347 drivers/staging/et131x/et131x.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/et131x/et131x.c b

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

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: Z

Re: [PATCH] et131x: fix allocation failures

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 again

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

Signed-off-by: ZHAO Gang Acked-by: Mark Einon --- 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 v4 7/7] staging: et131x: remove unnecessary pointer typecast

Signed-off-by: ZHAO Gang Acked-by: Mark Einon --- 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

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

Signed-off-by: ZHAO Gang Acked-by: Mark Einon --- 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 --- a/drivers/staging/et131x/et131x.c

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

Signed-off-by: ZHAO Gang --- 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 @@ -13,10 +13,6

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

Signed-off-by: ZHAO Gang --- 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/et131x.c +++ b

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

Signed-off-by: ZHAO Gang Acked-by: Mark Einon --- 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 --- a

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

Signed-off-by: ZHAO Gang Acked-by: Mark Einon --- 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

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

On Mon, Dec 9, 2013 at 4:53 PM, Greg Kroah-Hartman wrote: > On Mon, Dec 09, 2013 at 04:46:08PM +0800, ZHAO Gang wrote: >> Signed-off-by: ZHAO Gang >> --- >> drivers/staging/et131x/et131x.c | 24 ++-- >> 1 file changed, 10 insertions(+), 14 deleti

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

Signed-off-by: ZHAO Gang --- 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 @@ -13,10 +13,6

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

Signed-off-by: ZHAO Gang --- 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/et131x.c +++ b

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

Signed-off-by: ZHAO Gang --- 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 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging

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

Signed-off-by: ZHAO Gang --- 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/et131x.c +++ b

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

Signed-off-by: ZHAO Gang --- 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/et131x/et131x.c +++ b

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

Signed-off-by: ZHAO Gang --- 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 --- a/drivers/staging

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

Signed-off-by: ZHAO Gang --- 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/staging/et131x

[PATCH 1/2] staging: et131x: improve code consistency: access struct rx_ring

Let all the code use a pointer called rx_ring to access struct rx_ring members. Signed-off-by: ZHAO Gang --- drivers/staging/et131x/et131x.c | 48 + 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers

[PATCH 2/2] staging: et131x: improve code consistency: access struct tx_ring

Let all the code use a pointer called tx_ring to access struct tx_ring members. Signed-off-by: ZHAO Gang --- drivers/staging/et131x/et131x.c | 190 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers

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

Signed-off-by: ZHAO Gang --- 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/et131x.c +++ b

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

Signed-off-by: ZHAO Gang --- 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/et131x/et131x.c +++ b

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

Signed-off-by: ZHAO Gang --- 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/et131x/et131x.c +++ b

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

Signed-off-by: ZHAO Gang --- 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/staging/et131x

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

Signed-off-by: ZHAO Gang --- 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/et131x/et131x.c +++ b

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

Signed-off-by: ZHAO Gang --- 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 8d75a3f..1abea42 100644 --- a/drivers/staging/et131x/et131x.c +++ b

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

Signed-off-by: ZHAO Gang --- drivers/staging/et131x/et131x.c | 20 +++- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index b6ce68e..3e34c2e 100644 --- a/drivers/staging/et131x/et131x.c +++ b

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

Signed-off-by: ZHAO Gang --- 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 @@ -13,10 +13,6

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

Signed-off-by: ZHAO Gang --- 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 +++ b/drivers/staging

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

Signed-off-by: ZHAO Gang --- 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/et131x/et131x.c

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

Signed-off-by: ZHAO Gang --- 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/staging/et131x

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

Signed-off-by: ZHAO Gang --- 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 ee231f2..17ac711 100644 --- a/drivers/staging

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

On Thu, Dec 5, 2013 at 11:43 PM, Greg Kroah-Hartman 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 wrote: >> > Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro >> > is not preferred. >

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

On Tue, Dec 3, 2013 at 7:29 AM, Jingoo Han wrote: > Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro > is not preferred. > > Signed-off-by: Jingoo Han > --- Greg, this patch should be reverted. It do the opposite things. > drivers/vme/boards/vme_vmivme7805.c |2 +- > drivers/vme

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

On Tue, Dec 3, 2013 at 7:26 AM, Jingoo Han wrote: > Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro > is not preferred. > > Signed-off-by: Jingoo Han > I think you misunderstood the checkpatch.pl warning, it tells you what to do, not what not to do. WARNING: Use DEFINE_PCI_DEVICE_TA

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

On Wed, Dec 4, 2013 at 10:53 PM, Mark Einon 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 >> followin

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

On Thu, Dec 5, 2013 at 7:23 AM, Greg Kroah-Hartman 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 t

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

On Wed, Dec 4, 2013 at 8:01 PM, ZHAO Gang wrote: > On Wed, Dec 4, 2013 at 5:05 PM, Mark Einon 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, >>> whic

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

On Wed, Dec 4, 2013 at 5:05 PM, Mark Einon 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 leas

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

stop read and return error when hit max delay time. Signed-off-by: ZHAO Gang --- 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/staging/et131x

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

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:

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

remove items that have been done Signed-off-by: ZHAO Gang --- 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 +++ b/drivers

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

Variable u32 numrfd is not necessary in this function. Signed-off-by: ZHAO Gang --- 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 100644 --- a

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

but not used [-Wunused-but-set-variable] u32 pm_csr; ^ Signed-off-by: ZHAO Gang --- 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 100644 --- a/drivers

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

Signed-off-by: ZHAO Gang --- 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 +++ b/drivers

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

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 --- drivers/staging/et131x/et131x.c | 202

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

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 --- driver

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

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 --- drivers/staging

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

combine two dma_alloc_coherent to one Signed-off-by: ZHAO Gang --- 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 index a3d1b53

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

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

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

but not used [-Wunused-but-set-variable] u32 pm_csr; ^ Signed-off-by: ZHAO Gang --- 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 100644 --- a/drivers

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

On Wed, Dec 4, 2013 at 3:09 PM, Greg Kroah-Hartman 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 >> wrote: >> > On Sat, Nov 23, 2013 at 12:21:29AM +0800, ZHAO Gang wrote: >> >> 1. As

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

On Wed, Dec 4, 2013 at 12:38 AM, Greg Kroah-Hartman wrote: > On Sat, Nov 23, 2013 at 12:21:29AM +0800, ZHAO Gang wrote: >> 1. As TODO list suggested, do this sort of things to reduce split lines: >> struct fbr_lookup *fbr; >> fbr = rx_local->fbr[id]; >&

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

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:

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

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 --- drivers/staging

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

On Thu, Nov 28, 2013 at 3:58 PM, Dan Carpenter 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; >> >&

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

Signed-off-by: ZHAO Gang --- 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(+), 9 deletions

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

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] staging: et131x: some code style change

Signed-off-by: ZHAO Gang --- 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 +++ b/drivers/staging

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

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 --- drivers/staging/et131x/et131x.c | 202

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

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 2/4] staging: et131x: simplify tx dma code

combine two dma_alloc_coherent to one Signed-off-by: ZHAO Gang --- 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 index 7c6031e

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

On Wed, Nov 27, 2013 at 9:26 PM, Dan Carpenter wrote: > On Wed, Nov 27, 2013 at 08:43:57PM +0800, ZHAO Gang wrote: >> >> + /* Update the pointer */ >> >> + dma_addr += fbr->buffsize; >> > &g

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

On Wed, Nov 27, 2013 at 6:13 PM, Dan Carpenter 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.

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

On Wed, Nov 27, 2013 at 8:04 PM, Dan Carpenter 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 >> wrote: >> > On Wed, Nov 27, 2013 at 03:45:12PM +0800, ZHAO Gang wrote: >> >&g

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

On Wed, Nov 27, 2013 at 6:06 PM, Dan Carpenter 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

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

On Wed, Nov 27, 2013 at 5:02 PM, Dan Carpenter 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; >> >&

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

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 2/3] staging: et131x: simplify tx dma code

combine two dma_alloc_coherent to one Signed-off-by: ZHAO Gang --- 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 index 409949f

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

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 --- drivers/staging/et131x/et131x.c | 219

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

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 v5 7/7] staging: et131x: update TODO list

remove items that have been done Signed-off-by: ZHAO Gang Acked-by: Mark Einon --- v3 -> v4 -> v5: version bump, sequence number bump drivers/staging/et131x/README | 5 - 1 file changed, 5 deletions(-) diff --git a/drivers/staging/et131x/README b/drivers/staging/et131x/README

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

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:

[PATCH v5 5/7] staging: et131x: stop read when hit max delay in et131x_phy_mii_read

stop read and return error when hit max delay time. Signed-off-by: ZHAO Gang Acked-by: Mark Einon --- v3 -> v4 -> v5: version bump, sequence number bump drivers/staging/et131x/et131x.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/et131x/et131x.c b/drivers/s

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

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 --- v3 -> v4: no cha

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

Variable u32 numrfd is not necessary in this function. Signed-off-by: ZHAO Gang --- 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 100644 --- a

[PATCH v5 2/7] staging: et131x: change function name

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

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

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 --- v4 -> v5:

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

On Fri, Nov 22, 2013 at 8:13 PM, Dan Carpenter 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 >> wrote: >> > On Fri, Nov 22, 2013 at 04:44:48PM +0800, ZHAO Gang wrote: >> >> > >>

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

On Fri, Nov 22, 2013 at 7:56 PM, Denis Kirjanov 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 available. There

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

On Fri, Nov 22, 2013 at 5:17 PM, Denis Kirjanov wrote: > On 11/22/13, Mark Einon 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. >>> >>>

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

On Fri, Nov 22, 2013 at 5:00 PM, Dan Carpenter 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

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

On Fri, Nov 22, 2013 at 4:57 PM, Dan Carpenter wrote: > This is a lot of spaghetti. Just write it like this: > > > if (adapter->tx_ring.used >= NUM_TCB) > goto drop; > if (adapter->flags & FMP_ADAPTER_FAIL_SEND_MASK) > goto drop; > if (!neti

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

On Fri, Nov 22, 2013 at 4:08 PM, Dan Carpenter wrote: > On Fri, Nov 22, 2013 at 10:54:27AM +0800, ZHAO Gang wrote: >> 1. change function name: et1310_phy_power_down -> et1310_phy_power_switch >> change function name to better describe its functionality. >> >>

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

On Fri, Nov 22, 2013 at 5:20 AM, Mark Einon 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 > > If the two small issues in patch 1/5 are fixed: Fixed in v4 of patch 1/5 I sent

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

Then replace 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 --- v3 -> v4: don't split dev_er

Re: [PATCH v3 0/5] staging: et131x: patches for et131x driver

On Fri, Nov 22, 2013 at 5:18 AM, Mark Einon wrote: > On Wed, Nov 20, 2013 at 03:53:50PM +0800, ZHAO Gang wrote: >> This patch set should apply to current staging-next tree >> >> ZHAO Gang (5): >> staging: et131x: clean up code >> staging: et131x: drop pack