From cc6b00d4b9690065ca8707d4765c60634b9aee97 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 14 Apr 2008 00:46:01 -0700 Subject: [PATCH] --- yaml --- r: 88322 b: refs/heads/master c: 159d83363b629c91d020734207c1bc788b96af5a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bridge/br_netfilter.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 384c3ba7504d..c80c79933c59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4dee959723e2bf3a0f9343a46841cd2f0029d424 +refs/heads/master: 159d83363b629c91d020734207c1bc788b96af5a diff --git a/trunk/net/bridge/br_netfilter.c b/trunk/net/bridge/br_netfilter.c index 1c0efd8ad9f3..af7e8be8d8d2 100644 --- a/trunk/net/bridge/br_netfilter.c +++ b/trunk/net/bridge/br_netfilter.c @@ -110,7 +110,8 @@ static inline __be16 pppoe_proto(const struct sk_buff *skb) * ipt_REJECT needs it. Future netfilter modules might * require us to fill additional fields. */ static struct net_device __fake_net_device = { - .hard_header_len = ETH_HLEN + .hard_header_len = ETH_HLEN, + .nd_net = &init_net, }; static struct rtable __fake_rtable = {