diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /security/selinux/netlabel.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'security/selinux/netlabel.c')
| -rw-r--r-- | security/selinux/netlabel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c index e68823741ad5..2534400317c5 100644 --- a/security/selinux/netlabel.c +++ b/security/selinux/netlabel.c | |||
| @@ -204,7 +204,7 @@ int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, | |||
| 204 | * | 204 | * |
| 205 | * Description | 205 | * Description |
| 206 | * Call the NetLabel mechanism to set the label of a packet using @sid. | 206 | * Call the NetLabel mechanism to set the label of a packet using @sid. |
| 207 | * Returns zero on auccess, negative values on failure. | 207 | * Returns zero on success, negative values on failure. |
| 208 | * | 208 | * |
| 209 | */ | 209 | */ |
| 210 | int selinux_netlbl_skbuff_setsid(struct sk_buff *skb, | 210 | int selinux_netlbl_skbuff_setsid(struct sk_buff *skb, |