summaryrefslogtreecommitdiff
path: root/ether.conf
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-07-08 10:16:17 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-07-08 10:16:17 +0200
commitfb9f1275adaa63b6c7791ce224346638f33e0708 (patch)
tree09f9b57d5ff49266d438f5e059557716e10275d2 /ether.conf
parentca6a0798fe39efb3f1258d9b15f7e02d8c546eb3 (diff)
config: check for available databases
We need to have: GEOIP_CITY_EDITION_REV1, GEOIP_CITY_EDITION_REV1_V6, GEOIP_COUNTRY_EDITION, GEOIP_COUNTRY_EDITION_V6, GEOIP_ASNUM_EDITION, GEOIP_ASNUM_EDITION_V6. Not all might be available on older versions. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'ether.conf')
0 files changed, 0 insertions, 0 deletions
b971a69cc9794ff4a6715c11f7f2'>diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
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 'include/net/bluetooth/bluetooth.h')