projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[cascardo/linux.git]
/
include
/
net
/
cls_cgroup.h
diff --git
a/include/net/cls_cgroup.h
b/include/net/cls_cgroup.h
index
2581638
..
0fee061
100644
(file)
--- a/
include/net/cls_cgroup.h
+++ b/
include/net/cls_cgroup.h
@@
-24,7
+24,7
@@
struct cgroup_cls_state
u32 classid;
};
u32 classid;
};
-extern void sock_update_classid(struct sock *sk
, struct task_struct *task
);
+extern void sock_update_classid(struct sock *sk);
#if IS_BUILTIN(CONFIG_NET_CLS_CGROUP)
static inline u32 task_cls_classid(struct task_struct *p)
#if IS_BUILTIN(CONFIG_NET_CLS_CGROUP)
static inline u32 task_cls_classid(struct task_struct *p)
@@
-61,7
+61,7
@@
static inline u32 task_cls_classid(struct task_struct *p)
}
#endif
#else /* !CGROUP_NET_CLS_CGROUP */
}
#endif
#else /* !CGROUP_NET_CLS_CGROUP */
-static inline void sock_update_classid(struct sock *sk
, struct task_struct *task
)
+static inline void sock_update_classid(struct sock *sk)
{
}
{
}