diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-25 01:42:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-25 01:42:21 -0700 |
| commit | c649c0e31d5736a4b7c5c3454182091dda4bbe62 (patch) | |
| tree | 93da11bf4ea828611ab5277a7dbadf57724c2b1e /net/ipv6 | |
| parent | daebafed7fef54fcc73d2d01431122cfd578d1e0 (diff) | |
| parent | 4e2fd555199977c5994d1a4d2d3b8761b20ca4c7 (diff) | |
| download | linux-c649c0e31d5736a4b7c5c3454182091dda4bbe62.tar.gz linux-c649c0e31d5736a4b7c5c3454182091dda4bbe62.tar.bz2 linux-c649c0e31d5736a4b7c5c3454182091dda4bbe62.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/route.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 1394ddb6e35c..032a5ec391c5 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -137,6 +137,7 @@ static struct rt6_info ip6_null_entry_template = { } }, .rt6i_flags = (RTF_REJECT | RTF_NONEXTHOP), + .rt6i_protocol = RTPROT_KERNEL, .rt6i_metric = ~(u32) 0, .rt6i_ref = ATOMIC_INIT(1), }; @@ -159,6 +160,7 @@ static struct rt6_info ip6_prohibit_entry_template = { } }, .rt6i_flags = (RTF_REJECT | RTF_NONEXTHOP), + .rt6i_protocol = RTPROT_KERNEL, .rt6i_metric = ~(u32) 0, .rt6i_ref = ATOMIC_INIT(1), }; @@ -176,6 +178,7 @@ static struct rt6_info ip6_blk_hole_entry_template = { } }, .rt6i_flags = (RTF_REJECT | RTF_NONEXTHOP), + .rt6i_protocol = RTPROT_KERNEL, .rt6i_metric = ~(u32) 0, .rt6i_ref = ATOMIC_INIT(1), }; |