diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 12:26:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 12:26:46 -0400 |
commit | 15c54033964a943de7b0763efd3bd0ede7326395 (patch) | |
tree | 840b292612d1b5396d5bab5bde537a9013db3ceb /net/sched/act_pedit.c | |
parent | ad5da3cf39a5b11a198929be1f2644e17ecd767e (diff) | |
parent | 912a41a4ab935ce8c4308428ec13fc7f8b1f18f4 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (448 commits)
[IPV4] nl_fib_lookup: Initialise res.r before fib_res_put(&res)
[IPV6]: Fix thinko in ipv6_rthdr_rcv() changes.
[IPV4]: Add multipath cached to feature-removal-schedule.txt
[WIRELESS] cfg80211: Clarify locking comment.
[WIRELESS] cfg80211: Fix locking in wiphy_new.
[WEXT] net_device: Don't include wext bits if not required.
[WEXT]: Misc code cleanups.
[WEXT]: Reduce inline abuse.
[WEXT]: Move EXPORT_SYMBOL statements where they belong.
[WEXT]: Cleanup early ioctl call path.
[WEXT]: Remove options.
[WEXT]: Remove dead debug code.
[WEXT]: Clean up how wext is called.
[WEXT]: Move to net/wireless
[AFS]: Eliminate cmpxchg() usage in vlocation code.
[RXRPC]: Fix pointers passed to bitops.
[RXRPC]: Remove bogus atomic_* overrides.
[AFS]: Fix u64 printing in debug logging.
[AFS]: Add "directory write" support.
[AFS]: Implement the CB.InitCallBackState3 operation.
...
Diffstat (limited to 'net/sched/act_pedit.c')
-rw-r--r-- | net/sched/act_pedit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c index 3d6a2fcc9ce4..45b3cda86a21 100644 --- a/net/sched/act_pedit.c +++ b/net/sched/act_pedit.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
29 | #include <linux/proc_fs.h> | 29 | #include <linux/proc_fs.h> |
30 | #include <net/netlink.h> | ||
30 | #include <net/sock.h> | 31 | #include <net/sock.h> |
31 | #include <net/pkt_sched.h> | 32 | #include <net/pkt_sched.h> |
32 | #include <linux/tc_act/tc_pedit.h> | 33 | #include <linux/tc_act/tc_pedit.h> |
@@ -136,7 +137,7 @@ static int tcf_pedit(struct sk_buff *skb, struct tc_action *a, | |||
136 | } | 137 | } |
137 | } | 138 | } |
138 | 139 | ||
139 | pptr = skb->nh.raw; | 140 | pptr = skb_network_header(skb); |
140 | 141 | ||
141 | spin_lock(&p->tcf_lock); | 142 | spin_lock(&p->tcf_lock); |
142 | 143 | ||
@@ -195,7 +196,7 @@ done: | |||
195 | static int tcf_pedit_dump(struct sk_buff *skb, struct tc_action *a, | 196 | static int tcf_pedit_dump(struct sk_buff *skb, struct tc_action *a, |
196 | int bind, int ref) | 197 | int bind, int ref) |
197 | { | 198 | { |
198 | unsigned char *b = skb->tail; | 199 | unsigned char *b = skb_tail_pointer(skb); |
199 | struct tcf_pedit *p = a->priv; | 200 | struct tcf_pedit *p = a->priv; |
200 | struct tc_pedit *opt; | 201 | struct tc_pedit *opt; |
201 | struct tcf_t t; | 202 | struct tcf_t t; |
@@ -226,7 +227,7 @@ static int tcf_pedit_dump(struct sk_buff *skb, struct tc_action *a, | |||
226 | return skb->len; | 227 | return skb->len; |
227 | 228 | ||
228 | rtattr_failure: | 229 | rtattr_failure: |
229 | skb_trim(skb, b - skb->data); | 230 | nlmsg_trim(skb, b); |
230 | kfree(opt); | 231 | kfree(opt); |
231 | return -1; | 232 | return -1; |
232 | } | 233 | } |