diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-03-24 14:58:58 +0100 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-03-24 14:58:58 +0100 |
commit | 2e6d603e5163e6f32a8686744b4d53e8778957ba (patch) | |
tree | ead238ea5efe7b3f52728793fe9dfa76ca52bc31 /net/bridge/br_input.c | |
parent | MAINTAINERS: Add maintianer entry for crypto/s5p-sss (diff) | |
parent | Linux 4.11-rc3 (diff) | |
download | linux-2e6d603e5163e6f32a8686744b4d53e8778957ba.tar.xz linux-2e6d603e5163e6f32a8686744b4d53e8778957ba.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merging 4.11-rc3 to pick up md5 removal from /dev/random.
Diffstat (limited to 'net/bridge/br_input.c')
-rw-r--r-- | net/bridge/br_input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 236f34244dbe..013f2290bfa5 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -30,6 +30,7 @@ EXPORT_SYMBOL(br_should_route_hook); static int br_netif_receive_skb(struct net *net, struct sock *sk, struct sk_buff *skb) { + br_drop_fake_rtable(skb); return netif_receive_skb(skb); } |