]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1790665189e92c7291f8761753bb65138e244232
treec9d1ba8878eee8d52a1339fd31577074d5ecd39a
parente0b014e6f523ec1819f9177c956b215f5a7b0da7
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: 3d1fdee21 ("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
drivers/net/ethernet/dec/tulip/de4x5.h
drivers/net/ethernet/freescale/fec_main.c