diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /pfinet/linux-src/net/ipv6/ndisc.c | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'pfinet/linux-src/net/ipv6/ndisc.c')
| -rw-r--r-- | pfinet/linux-src/net/ipv6/ndisc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pfinet/linux-src/net/ipv6/ndisc.c b/pfinet/linux-src/net/ipv6/ndisc.c index 3b3d3f4e..61f950d2 100644 --- a/pfinet/linux-src/net/ipv6/ndisc.c +++ b/pfinet/linux-src/net/ipv6/ndisc.c @@ -554,7 +554,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) if (skb->nh.ipv6h->hop_limit != 255) { printk(KERN_INFO - "NDISC: fake router advertisment received\n"); + "NDISC: fake router advertisement received\n"); return; } @@ -694,7 +694,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) ND_PRINTK0("got illegal option with RA"); break; default: - ND_PRINTK0("unkown option in RA\n"); + ND_PRINTK0("unknown option in RA\n"); }; optlen -= len; opt += len; |