Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6: Fix common misspellings
This commit is contained in:
@@ -1084,7 +1084,7 @@ static int ipv6_get_saddr_eval(struct net *net,
|
||||
case IPV6_SADDR_RULE_PRIVACY:
|
||||
{
|
||||
/* Rule 7: Prefer public address
|
||||
* Note: prefer temprary address if use_tempaddr >= 2
|
||||
* Note: prefer temporary address if use_tempaddr >= 2
|
||||
*/
|
||||
int preftmp = dst->prefs & (IPV6_PREFER_SRC_PUBLIC|IPV6_PREFER_SRC_TMP) ?
|
||||
!!(dst->prefs & IPV6_PREFER_SRC_TMP) :
|
||||
@@ -1968,7 +1968,7 @@ ok:
|
||||
* to the stored lifetime since we'll
|
||||
* be updating the timestamp below,
|
||||
* else we'll set it back to the
|
||||
* minumum.
|
||||
* minimum.
|
||||
*/
|
||||
if (prefered_lft != ifp->prefered_lft) {
|
||||
valid_lft = stored_lft;
|
||||
|
@@ -1113,7 +1113,7 @@ static int __init inet6_init(void)
|
||||
/*
|
||||
* ipngwg API draft makes clear that the correct semantics
|
||||
* for TCP and UDP is to consider one TCP and UDP instance
|
||||
* in a host availiable by both INET and INET6 APIs and
|
||||
* in a host available by both INET and INET6 APIs and
|
||||
* able to communicate via both network protocols.
|
||||
*/
|
||||
|
||||
|
@@ -779,7 +779,7 @@ slow_path:
|
||||
/* IF: it doesn't fit, use 'mtu' - the data space left */
|
||||
if (len > mtu)
|
||||
len = mtu;
|
||||
/* IF: we are not sending upto and including the packet end
|
||||
/* IF: we are not sending up to and including the packet end
|
||||
then align the next start on an eight byte boundary */
|
||||
if (len < left) {
|
||||
len &= ~7;
|
||||
|
@@ -2248,7 +2248,7 @@ static int __init ip6_tables_init(void)
|
||||
if (ret < 0)
|
||||
goto err1;
|
||||
|
||||
/* Noone else will be downing sem now, so we won't sleep */
|
||||
/* No one else will be downing sem now, so we won't sleep */
|
||||
ret = xt_register_targets(ip6t_builtin_tg, ARRAY_SIZE(ip6t_builtin_tg));
|
||||
if (ret < 0)
|
||||
goto err2;
|
||||
|
@@ -71,7 +71,7 @@ static unsigned int ipv6_defrag(unsigned int hooknum,
|
||||
if (reasm == NULL)
|
||||
return NF_STOLEN;
|
||||
|
||||
/* error occured or not fragmented */
|
||||
/* error occurred or not fragmented */
|
||||
if (reasm == skb)
|
||||
return NF_ACCEPT;
|
||||
|
||||
|
Reference in New Issue
Block a user