diff options
| author | Changli Gao <xiaosuo@gmail.com> | 2010-06-24 16:25:12 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-28 23:24:32 -0700 |
| commit | 210d6de78c5d7c785fc532556cea340e517955e1 (patch) | |
| tree | e4bbac89a8bc16154f51ad61e140be1b7bd2b92d /include/net/sch_generic.h | |
| parent | c4ead4c595cd54cf7b1a184d4f888ce0d7cce7d4 (diff) | |
| download | blackbird-op-linux-210d6de78c5d7c785fc532556cea340e517955e1.tar.gz blackbird-op-linux-210d6de78c5d7c785fc532556cea340e517955e1.zip | |
act_mirred: don't clone skb when skb isn't shared
don't clone skb when skb isn't shared
When the tcf_action is TC_ACT_STOLEN, and the skb isn't shared, we don't need
to clone a new skb. As the skb will be freed after this function returns, we
can use it freely once we get a reference to it.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
----
include/net/sch_generic.h | 11 +++++++++--
net/sched/act_mirred.c | 6 +++---
2 files changed, 12 insertions(+), 5 deletions(-)
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sch_generic.h')
| -rw-r--r-- | include/net/sch_generic.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index b35301b0c7b6..977ec06ed0c7 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -594,9 +594,16 @@ static inline u32 qdisc_l2t(struct qdisc_rate_table* rtab, unsigned int pktlen) } #ifdef CONFIG_NET_CLS_ACT -static inline struct sk_buff *skb_act_clone(struct sk_buff *skb, gfp_t gfp_mask) +static inline struct sk_buff *skb_act_clone(struct sk_buff *skb, gfp_t gfp_mask, + int action) { - struct sk_buff *n = skb_clone(skb, gfp_mask); + struct sk_buff *n; + + if ((action == TC_ACT_STOLEN || action == TC_ACT_QUEUED) && + !skb_shared(skb)) + n = skb_get(skb); + else + n = skb_clone(skb, gfp_mask); if (n) { n->tc_verd = SET_TC_VERD(n->tc_verd, 0); |
