Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next

This commit is contained in:
James Morris
2008-10-11 09:26:14 +11:00
22 changed files with 2780 additions and 1020 deletions

View File

@ -354,9 +354,11 @@ static void smk_cipso_doi(void)
doip->tags[rc] = CIPSO_V4_TAG_INVALID;
rc = netlbl_cfg_cipsov4_add_map(doip, NULL, &audit_info);
if (rc != 0)
if (rc != 0) {
printk(KERN_WARNING "%s:%d add rc = %d\n",
__func__, __LINE__, rc);
kfree(doip);
}
}
/**