diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 17:32:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 17:32:08 -0800 |
| commit | 12074a35b4ef36d7a971beaf42412b22f304cdd1 (patch) | |
| tree | ee52353367f9b2f2bd983d18806a3e64f00886f3 /net/ipv4/ip_gre.c | |
| parent | 49c91fb01ff3948285608c65754b3ffbf57d50f2 (diff) | |
| parent | 34a0b3cdc078746788ffc49e56da0db62b8b6ea4 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 4e9c74b54b1..a4c347c3b8e 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -1217,7 +1217,7 @@ static int ipgre_tunnel_init(struct net_device *dev) return 0; } -int __init ipgre_fb_tunnel_init(struct net_device *dev) +static int __init ipgre_fb_tunnel_init(struct net_device *dev) { struct ip_tunnel *tunnel = (struct ip_tunnel*)dev->priv; struct iphdr *iph = &tunnel->parms.iph; |