pull request net: 2013-08-17

pull request net: 2013-08-17

[Antonio Quartulli]

Hello David,

here you have another very small fix intended for net/linux-3.11.
Tha patch properly closes a seq_read session by adding an invocation to
skb_abort_seq_read().

Please pull or let me know if there is any problem.

Also, when do you plan to merge net into net-next? I have a couple of changes
for net-next which is better to apply after the merge.


Thanks a lot,
	Antonio


The following changes since commit 0f7dd1aa8f959216f1faa71513b9d3c1a9065e5a:

  Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux (2013-08-16 10:00:18 -0700)

are available in the git repository at:


  git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem

for you to fetch changes up to 9863634227f1390737104f93c0748e6a7b52020e:

  batman-adv: properly end seq_read session (2013-08-17 12:23:37 +0200)

----------------------------------------------------------------
Included change:
- Add a missing skb_abort_seq_read() to properly close seq_read session

----------------------------------------------------------------
Antonio Quartulli (1):
      batman-adv: properly end seq_read session

 net/batman-adv/main.c | 1 +
 1 file changed, 1 insertion(+)n-Reply-To: 

Hello David,

here you have another very small fix for net/linux-3.11.
Tha patch properly closes a seq_read session by adding an invocation to
skb_abort_seq_read().

Please pull or let me know if there is any problem.

Also, when do you plan to merge net into net-next? I have a couple of changes
for net-next which is better to apply after the merge.


Thanks a lot,
	Antonio


The following changes since commit 0f7dd1aa8f959216f1faa71513b9d3c1a9065e5a:

  Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux (2013-08-16 10:00:18 -0700)

are available in the git repository at:


  git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem

for you to fetch changes up to 9863634227f1390737104f93c0748e6a7b52020e:

  batman-adv: properly end seq_read session (2013-08-17 12:23:37 +0200)

----------------------------------------------------------------
Included change:
- Add a missing skb_abort_seq_read() to properly close seq_read session

----------------------------------------------------------------
Antonio Quartulli (1):
      batman-adv: properly end seq_read session

 net/batman-adv/main.c | 1 +
 1 file changed, 1 insertion(+)

[PATCH] batman-adv: properly end seq_read session

[Antonio Quartulli]

A missing skb_abort_seq_read() has to be added in order to
properly close the seq_read session initiated with
skb_prepare_seq_read().

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
 net/batman-adv/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 08125f3..51aafd6 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -473,6 +473,7 @@ __be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr)
 		crc = crc32c(crc, data, len);
 		consumed += len;
 	}
+	skb_abort_seq_read(&st);
 
 	return htonl(crc);
 }
-- 
1.8.1.5

Re: pull request net: 2013-08-17

[Antonio Quartulli]

[-- Attachment #1: Type: text/plain, Size: 692 bytes --]

On Sat, Aug 17, 2013 at 12:34:53PM +0200, Antonio Quartulli wrote:
> Hello David,
> 
> here you have another very small fix intended for net/linux-3.11.
> Tha patch properly closes a seq_read session by adding an invocation to
> skb_abort_seq_read().
> 
> Please pull or let me know if there is any problem.
> 
> Also, when do you plan to merge net into net-next? I have a couple of changes
> for net-next which is better to apply after the merge.

Hi David,

sorry but I just realised there was another small patch to add here.
I'll re-send this pull request in a while.


Regards,

-- 
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: pull request net: 2013-08-17

[David Miller]

From: Antonio Quartulli <ordex@autistici.org>
Date: Sat, 17 Aug 2013 12:34:53 +0200

> here you have another very small fix intended for net/linux-3.11.
> Tha patch properly closes a seq_read session by adding an invocation to
> skb_abort_seq_read().
> 
> Please pull or let me know if there is any problem.

Pulled thanks.

> Also, when do you plan to merge net into net-next? I have a couple of changes
> for net-next which is better to apply after the merge.

I did one the other day.  I'll probably do one the next time I merge
changes to Linus, say Thursday some time.