projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[firefly-linux-kernel-4.4.55.git]
/
net
/
netlabel
/
netlabel_cipso_v4.c
diff --git
a/net/netlabel/netlabel_cipso_v4.c
b/net/netlabel/netlabel_cipso_v4.c
index bae5756b1626f0291914ce6dd24a13717c334c9b..6bf878335d9436d40b1619c37c8918f3bd12beb0 100644
(file)
--- a/
net/netlabel/netlabel_cipso_v4.c
+++ b/
net/netlabel/netlabel_cipso_v4.c
@@
-5,7
+5,7
@@
* NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
* NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
- * Author: Paul Moore <paul
.moore@hp
.com>
+ * Author: Paul Moore <paul
@paul-moore
.com>
*
*/
*
*/
@@
-39,7
+39,7
@@
#include <net/genetlink.h>
#include <net/netlabel.h>
#include <net/cipso_ipv4.h>
#include <net/genetlink.h>
#include <net/netlabel.h>
#include <net/cipso_ipv4.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include "netlabel_user.h"
#include "netlabel_cipso_v4.h"
#include "netlabel_user.h"
#include "netlabel_cipso_v4.h"