diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-01-15 17:00:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-15 17:00:47 -0800 |
| commit | e5d640239fbb3a543b6151d49656b7573b940fdf (patch) | |
| tree | a1487e383ad39c19412bd2c3c3fa3a91f4f3963a /drivers/net/usb/zaurus.c | |
| parent | Revert "batman-adv: drop dependency against CRC16" (diff) | |
| parent | ipv6 addrconf: don't cleanup prefix route for IFA_F_NOPREFIXROUTE (diff) | |
| download | wireguard-linux-e5d640239fbb3a543b6151d49656b7573b940fdf.tar.xz wireguard-linux-e5d640239fbb3a543b6151d49656b7573b940fdf.zip | |
Merge branch 'noprefixroute'
Thomas Haller says:
====================
ipv6 addrconf: add IFA_F_NOPREFIXROUTE flag to suppress creation of IP6 routes
v1 -> v2: add a second commit, handling NOPREFIXROUTE in ip6_del_addr.
v2 -> v3: reword commit messages, code comments and some refactoring.
v3 -> v4: refactor, rename variables, add enum
v4 -> v5: rebase, so that patch applies cleanly to current net-next/master
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/zaurus.c')
0 files changed, 0 insertions, 0 deletions