Message ID | 1347633184-26837-3-git-send-email-wagi@monom.org |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
On Fri, Sep 14, 2012 at 4:33 PM, Daniel Wagner <wagi@monom.org> wrote: > From: Daniel Wagner <daniel.wagner@bmw-carit.de> > > commit 1f66c0a8833c3974ab6b35edcf4f8585b2f94592 > Author: Daniel Wagner <daniel.wagner@bmw-carit.de> > Date: Wed Sep 12 16:12:01 2012 +0200 > > cgroup: net_cls: Move sock_update_classid() declaration to cls_cgroup.h > > Claimed that there was only net/socket.c depending on > sock_update_class(). That is not true drivers/net/tun.c needs to > include the cls_cgroup.h header too. > > Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: "Michael S. Tsirkin" <mst@redhat.com> > Cc: Gao feng <gaofeng@cn.fujitsu.com> > Cc: Jamal Hadi Salim <jhs@mojatatu.com> > Cc: Joe Perches <joe@perches.com> > Cc: John Fastabend <john.r.fastabend@intel.com> > Cc: Li Zefan <lizefan@huawei.com> > Cc: Neil Horman <nhorman@tuxdriver.com> > Cc: Rick Jones <rick.jones2@hp.com> > Cc: Stanislav Kinsbursky <skinsbursky@parallels.com> > Cc: Tejun Heo <tj@kernel.org> > Cc: netdev@vger.kernel.org > Cc: cgroups@vger.kernel.org > --- > > This version is on top of the latest cgroup for-3.7 branch. > Thanks for the quick fix. Please honour Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>. If this is the fix for the breakage in today's Linux-Next (next-20120914), please add a "-next" to the subject next time. - Sedat - > drivers/net/tun.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/tun.c b/drivers/net/tun.c > index 3a16d4f..9336b82 100644 > --- a/drivers/net/tun.c > +++ b/drivers/net/tun.c > @@ -68,6 +68,7 @@ > #include <net/netns/generic.h> > #include <net/rtnetlink.h> > #include <net/sock.h> > +#include <net/cls_cgroup.h> > > #include <asm/uaccess.h> > > -- > 1.7.12.315.g682ce8b > > -- > To unsubscribe from this list: send the line "unsubscribe linux-next" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Sedat, On 14.09.2012 16:43, Sedat Dilek wrote: > On Fri, Sep 14, 2012 at 4:33 PM, Daniel Wagner <wagi@monom.org> wrote: >> From: Daniel Wagner <daniel.wagner@bmw-carit.de> >> >> commit 1f66c0a8833c3974ab6b35edcf4f8585b2f94592 >> Author: Daniel Wagner <daniel.wagner@bmw-carit.de> >> Date: Wed Sep 12 16:12:01 2012 +0200 >> >> cgroup: net_cls: Move sock_update_classid() declaration to cls_cgroup.h >> >> Claimed that there was only net/socket.c depending on >> sock_update_class(). That is not true drivers/net/tun.c needs to >> include the cls_cgroup.h header too. >> >> Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de> >> Cc: "David S. Miller" <davem@davemloft.net> >> Cc: "Michael S. Tsirkin" <mst@redhat.com> >> Cc: Gao feng <gaofeng@cn.fujitsu.com> >> Cc: Jamal Hadi Salim <jhs@mojatatu.com> >> Cc: Joe Perches <joe@perches.com> >> Cc: John Fastabend <john.r.fastabend@intel.com> >> Cc: Li Zefan <lizefan@huawei.com> >> Cc: Neil Horman <nhorman@tuxdriver.com> >> Cc: Rick Jones <rick.jones2@hp.com> >> Cc: Stanislav Kinsbursky <skinsbursky@parallels.com> >> Cc: Tejun Heo <tj@kernel.org> >> Cc: netdev@vger.kernel.org >> Cc: cgroups@vger.kernel.org >> --- >> >> This version is on top of the latest cgroup for-3.7 branch. >> > > Thanks for the quick fix. No problem. I am still ashamed not finding it myself. > Please honour Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>. Sure, will do next time. > If this is the fix for the breakage in today's Linux-Next > (next-20120914), please add a "-next" to the subject next time. Correct, this one is for linux-next but I got the impression that cgroup for-3.7 branch was ignored because of this. Therefore I have send two versions. Hmm, I'll need to check the results of todays next tree. thanks, daniel -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 3a16d4f..9336b82 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -68,6 +68,7 @@ #include <net/netns/generic.h> #include <net/rtnetlink.h> #include <net/sock.h> +#include <net/cls_cgroup.h> #include <asm/uaccess.h>