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/ipv4/ip_masq_quake.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/ipv4/ip_masq_quake.c')
-rw-r--r-- | pfinet/linux-src/net/ipv4/ip_masq_quake.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pfinet/linux-src/net/ipv4/ip_masq_quake.c b/pfinet/linux-src/net/ipv4/ip_masq_quake.c index 995c3a0a..646348d1 100644 --- a/pfinet/linux-src/net/ipv4/ip_masq_quake.c +++ b/pfinet/linux-src/net/ipv4/ip_masq_quake.c @@ -92,7 +92,7 @@ masq_quake_in (struct ip_masq_app *mapp, struct ip_masq *ms, struct sk_buff **sk iph = skb->nh.iph; uh = (struct udphdr *)&(((char *)iph)[iph->ihl*4]); - /* Check for lenght */ + /* Check for length */ if(ntohs(uh->len) < 5) return 0; @@ -178,7 +178,7 @@ masq_quake_out (struct ip_masq_app *mapp, struct ip_masq *ms, struct sk_buff **s iph = skb->nh.iph; uh = (struct udphdr *)&(((char *)iph)[iph->ihl*4]); - /* Check for lenght */ + /* Check for length */ if(ntohs(uh->len) < 5) return 0; |