Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

3f9aed7c

Commit 3f9aed7c authored 13 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge

parents 31817df0 a7f9becb

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

net/batman-adv/originator.c 2 additions, 0 deletions

net/batman-adv/originator.c
net/batman-adv/packet.h 3 additions, 1 deletion

net/batman-adv/packet.h
net/batman-adv/routing.c 12 additions, 0 deletions

net/batman-adv/routing.c
net/batman-adv/send.c 1 addition, 3 deletions

net/batman-adv/send.c
net/batman-adv/translation-table.c 128 additions, 28 deletions

net/batman-adv/translation-table.c
net/batman-adv/translation-table.h 1 addition, 0 deletions

net/batman-adv/translation-table.h

with 147 additions and 32 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment