Patchwork pull request: batman-adv 2013-04-17

login
register
mail settings
Submitter Antonio Quartulli
Date April 17, 2013, 9:03 p.m.
Message ID <1366232596-23172-1-git-send-email-ordex@autistici.org>
Download mbox
Permalink /patch/237363/
State Accepted
Delegated to: David Miller
Headers show

Pull-request

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

Comments

Antonio Quartulli - April 17, 2013, 9:03 p.m.
Hi David,

here you have a patch intended for net/linux-3.9 (if it can still make it..).
It is fixing a MAC address check routine which does not behave
correctly in case of multiple mesh interfaces in the same node.

This patch will generate some conflicts the next time you will merge net in
net-next and will also break it (this happens because the function this patch is
changing is used by some patches existing in net-next only).

I will send some instruction on how to solve the merge conflicts and a patch to
fix net-next soon.


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

Thanks a lot,
	Antonio



The following changes since commit 361cd29cf9363505c2a35bbf9a034a22feebfb07:

  qlcnic: fix beaconing test for 82xx adapter (2013-04-17 01:15:29 -0400)

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

  batman-adv: make is_my_mac() check for the current mesh only (2013-04-17 22:31:22 +0200)

----------------------------------------------------------------
Included changes:
- fix MAC address check in case of multiple mesh interfaces

----------------------------------------------------------------
Antonio Quartulli (1):
      batman-adv: make is_my_mac() check for the current mesh only

 net/batman-adv/main.c              |  5 ++++-
 net/batman-adv/main.h              |  2 +-
 net/batman-adv/routing.c           | 38 ++++++++++++++++++++------------------
 net/batman-adv/translation-table.c |  2 +-
 net/batman-adv/vis.c               |  4 ++--
 5 files changed, 28 insertions(+), 23 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - April 18, 2013, 6:51 p.m.
From: Antonio Quartulli <ordex@autistici.org>
Date: Wed, 17 Apr 2013 23:03:15 +0200

> here you have a patch intended for net/linux-3.9 (if it can still make it..).
> It is fixing a MAC address check routine which does not behave
> correctly in case of multiple mesh interfaces in the same node.

Pulled.

> This patch will generate some conflicts the next time you will merge net in
> net-next and will also break it (this happens because the function this patch is
> changing is used by some patches existing in net-next only).
> 
> I will send some instruction on how to solve the merge conflicts and a patch to
> fix net-next soon.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html