diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /net/sched | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/cls_cgroup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c index 0f815cc6a3db..e4877ca6727c 100644 --- a/net/sched/cls_cgroup.c +++ b/net/sched/cls_cgroup.c | |||
| @@ -161,6 +161,9 @@ static int cls_cgroup_change(struct tcf_proto *tp, unsigned long base, | |||
| 161 | struct tcf_exts e; | 161 | struct tcf_exts e; |
| 162 | int err; | 162 | int err; |
| 163 | 163 | ||
| 164 | if (!tca[TCA_OPTIONS]) | ||
| 165 | return -EINVAL; | ||
| 166 | |||
| 164 | if (head == NULL) { | 167 | if (head == NULL) { |
| 165 | if (!handle) | 168 | if (!handle) |
| 166 | return -EINVAL; | 169 | return -EINVAL; |