summaryrefslogtreecommitdiff
path: root/mausezahn
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2016-08-02 10:16:54 +0200
committerTobias Klauser <tklauser@distanz.ch>2016-08-02 10:19:32 +0200
commita378db32a6e88a04d839bf2c2f27f62d81986186 (patch)
tree4c899713a082fe8cf7edd77a2957049bc0445e0b /mausezahn
parentda6e1d1108ad22d68ccbff07fb569afebb265bf7 (diff)
dissectors: ethernet: Don't resolve OUI for locally administered addresses
Locally administered addresses do not contain an OUI, thus do not try to resolve it. Instead show "Locally Administered" as the vendor string. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'mausezahn')
0 files changed, 0 insertions, 0 deletions
/table>
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/Documentation/perf.txt')