projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
net
/
sched
/
cls_basic.c
diff --git
a/net/sched/cls_basic.c
b/net/sched/cls_basic.c
index
dfb300b
..
09fda68
100644
(file)
--- a/
net/sched/cls_basic.c
+++ b/
net/sched/cls_basic.c
@@
-9,7
+9,6
@@
* Authors: Thomas Graf <tgraf@suug.ch>
*/
* Authors: Thomas Graf <tgraf@suug.ch>
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
@@
-179,25
+178,23
@@
static int basic_change(struct tcf_proto *tp, unsigned long base, u32 handle,
err = -ENOBUFS;
if (head == NULL) {
err = -ENOBUFS;
if (head == NULL) {
- head = k
m
alloc(sizeof(*head), GFP_KERNEL);
+ head = k
z
alloc(sizeof(*head), GFP_KERNEL);
if (head == NULL)
goto errout;
if (head == NULL)
goto errout;
- memset(head, 0, sizeof(*head));
INIT_LIST_HEAD(&head->flist);
tp->root = head;
}
INIT_LIST_HEAD(&head->flist);
tp->root = head;
}
- f = k
m
alloc(sizeof(*f), GFP_KERNEL);
+ f = k
z
alloc(sizeof(*f), GFP_KERNEL);
if (f == NULL)
goto errout;
if (f == NULL)
goto errout;
- memset(f, 0, sizeof(*f));
err = -EINVAL;
if (handle)
f->handle = handle;
else {
err = -EINVAL;
if (handle)
f->handle = handle;
else {
- int i = 0x80000000;
+
unsigned
int i = 0x80000000;
do {
if (++head->hgenerator == 0x7FFFFFFF)
head->hgenerator = 1;
do {
if (++head->hgenerator == 0x7FFFFFFF)
head->hgenerator = 1;