mbox

pull request: batman-adv 2011-10-29

Message ID 1319875606-7794-1-git-send-email-lindner_marek@yahoo.de (mailing list archive)
State Not Applicable, archived
Headers

Pull-request

git://git.open-mesh.org/linux-merge.git batman-adv/maint

Message

Marek Lindner Oct. 29, 2011, 8:06 a.m. UTC 
  Hi David,

we have 3 more bugfixes for you which we would like to see getting
merged into net-next/linux-3.2. They fix refcounting, a crash on
module unload and a protocol handling bug.

Thanks,
Marek

The following changes since commit 9d8523931f7f5eb8900077f0da0fbe6b8ad0010b:

  batman-adv: correctly set the data field in the TT_REPONSE packet (2011-10-18 22:45:10 +0200)

are available in the git repository at:
  git://git.open-mesh.org/linux-merge.git batman-adv/maint

Antonio Quartulli (1):
      batman-adv: unify hash_entry field position in tt_local/global_entry

Simon Wunderlich (2):
      batman-adv: remove references for global tt entries
      batman-adv: add sanity check when removing global tts

 net/batman-adv/translation-table.c |   17 ++++++++++++++++-
 net/batman-adv/types.h             |    4 ++--
 2 files changed, 18 insertions(+), 3 deletions(-)

Comments

David Miller Oct. 30, 2011, 7:07 a.m. UTC | #1 
From: Marek Lindner <lindner_marek@yahoo.de>
Date: Sat, 29 Oct 2011 10:06:43 +0200

>   git://git.open-mesh.org/linux-merge.git batman-adv/maint

Pulled, but long term you should shore up your datastructures to
handle that issue in patch #3.

Make a common header:

	struct tt_entry_common {
		u8 addr[ETH_ALEN];
		struct hlist_node hash_entry;
	};

Then use that at the beginning of both structures:

	struct tt_local_entry {
		struct tt_entry_common common;
		unsigned long last_seen;
		...
	};

	struct tt_global_entry {
		struct tt_entry_comomn common;
		struct orig_node *orig_node;
		...
	};

And &p->common is what gets passed into tt_response_fill_table().
Sven Eckelmann Oct. 30, 2011, 9:05 a.m. UTC | #2 
On Sunday 30 October 2011 03:07:45 David Miller wrote:
[...]
> Make a common header:
> 
> 	struct tt_entry_common {
> 		u8 addr[ETH_ALEN];
> 		struct hlist_node hash_entry;
> 	};
> 
> Then use that at the beginning of both structures:
> 
> 	struct tt_local_entry {
> 		struct tt_entry_common common;
> 		unsigned long last_seen;
> 		...
> 	};
> 
> 	struct tt_global_entry {
> 		struct tt_entry_comomn common;
> 		struct orig_node *orig_node;
> 		...
> 	};
> 
> And &p->common is what gets passed into tt_response_fill_table().

Thanks for the pull. This is exactly the long term solution we want to submit 
later to net-next. But we also wanted to keep the patch as small as possible 
for stable@kernel.org

Thanks,
	Sven