]> git.karo-electronics.de Git - karo-tx-linux.git/commit
include/net/netprio_cgroup.h: various fixes
authorAndrew Morton <akpm@linux-foundation.org>
Wed, 30 Nov 2011 04:07:55 +0000 (15:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 04:13:40 +0000 (15:13 +1100)
commit9222aa56c0cef58b9c22954a46646f6b2fa74045
tree7d97be128b9f5d9ece588aee6bc76a0864ebcd77
parente44ab7b5388c5b0df0660fbac479dceaf8b80372
include/net/netprio_cgroup.h: various fixes

- make task_netprio_state() stub an inline C function

- Untangle strange ifdef arrangement - remove mention of CONFIG_CGROUPS
  and make everything depend on CONFIG_NETPRIO_CGROUP.

- Don't build sock_update_netprioidx() when CONFIG_NETPRIO_CGROUP=n

- make the skb_update_prio() stub an inlined C function

Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: John Fastabend <john.r.fastabend@intel.com>
Cc: Robert Love <robert.w.love@intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
include/net/netprio_cgroup.h
net/core/dev.c
net/core/sock.c