[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1380744201-2074-1-git-send-email-antonio@meshcoding.com>
Date: Wed, 2 Oct 2013 22:03:20 +0200
From: Antonio Quartulli <antonio@...hcoding.com>
To: davem@...emloft.net
Cc: netdev@...r.kernel.org, b.a.t.m.a.n@...ts.open-mesh.org
Subject: pull request net: 2013-10-02
Hello David,
this is a "one-change" pull request intended for net/linux-3.{12,11,10}.
This patch from Matthias Schiffer is fixing the init routine of the Network
Coding component by preventing it from registering the handler for the CODED
packet type each time a new soft-interface is created.
Without this fix a second soft-interface cannot be created unless the Network
Coding component is not part of the module (not compiled-in).
As I mentioned before, this fix should be queued for stable as it aims
kernels older than linux-3.12.
Please pull or let me know of any problem.
Thanks a lot,
Antonio
p.s. this change generates some non-negligible conflicts with the patchset I'd
like to send to net-next during this week. Since I'd like to solve them all by
myself before sending the new patches, I'd kindly ask you to merge net into
net-next when possible.
The following changes since commit c31eeaced22ce8bd61268a3c595d542bb38c0a4f:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2013-10-01 12:58:48 -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 6c519bad7b19a2c14a075b400edabaa630330123:
batman-adv: set up network coding packet handlers during module init (2013-10-02 13:46:19 +0200)
----------------------------------------------------------------
Included change:
- fix multi soft-interfaces setups with Network Coding enabled by
registering the CODED packet type once only (instead of once per soft-if)
----------------------------------------------------------------
Matthias Schiffer (1):
batman-adv: set up network coding packet handlers during module init
net/batman-adv/main.c | 5 +++--
net/batman-adv/network-coding.c | 28 ++++++++++++++++++----------
net/batman-adv/network-coding.h | 14 ++++++++++----
3 files changed, 31 insertions(+), 16 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists