diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2016-08-12 16:34:49 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-08-13 14:51:02 -0700 |
| commit | 6176e89c5734e597f3e2279c8d5629a523cf6537 (patch) | |
| tree | c9d1ba8878eee8d52a1339fd31577074d5ecd39a /drivers/net/can/usb/ems_usb.c | |
| parent | Merge branch 'thunderx-next' (diff) | |
| download | linux-dev-6176e89c5734e597f3e2279c8d5629a523cf6537.tar.xz linux-dev-6176e89c5734e597f3e2279c8d5629a523cf6537.zip | |
net: fix up a few missing hashtable.h conflict resolutions
There are a couple of leftover symbol conflicts caused by hashtable.h
being included by netdevice.h; those were not caught as build failure
(they're "only" a warning, but in fact real bugs). Fix those up.
Fixes: e87a8f24c ("net: resolve symbol conflicts with generic hashtable.h")
Reported-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/usb/ems_usb.c')
0 files changed, 0 insertions, 0 deletions