projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a31eb63) | patch
net: fix up a few missing hashtable.h conflict resolutions
authorJiri Kosina <jkosina@suse.cz>
Fri, 12 Aug 2016 14:34:49 +0000 (16:34 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sat, 13 Aug 2016 21:51:02 +0000 (14:51 -0700)
commit6176e89c5734e597f3e2279c8d5629a523cf6537
treec9d1ba8878eee8d52a1339fd31577074d5ecd39atree | snapshot (tar.gz zip)
parenta31eb63a0a392d38c00dd292f81623bf933aa6bccommit | diff
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>
drivers/net/ethernet/dec/tulip/de4x5.c diff | blob | blame | history
drivers/net/ethernet/dec/tulip/de4x5.h diff | blob | blame | history
drivers/net/ethernet/freescale/fec_main.c diff | blob | blame | history