diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-06-11 10:00:49 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-06-11 10:00:49 -0400 |
| commit | 36432dae73cf2c90a59b39c8df9fd8219272b005 (patch) | |
| tree | 660b9104305a809ec4fdeb295ca13d6e90790ecc /drivers/net/veth.c | |
| parent | 440f0d588555892601cfe511728a0fc0c8204063 (diff) | |
| parent | bb400801c2f40bbd9a688818323ad09abfc4e581 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
Diffstat (limited to 'drivers/net/veth.c')
| -rw-r--r-- | drivers/net/veth.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 8e56fcf0a0e3..87197dd9c788 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c | |||
| @@ -176,8 +176,6 @@ static int veth_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 176 | if (dev->features & NETIF_F_NO_CSUM) | 176 | if (dev->features & NETIF_F_NO_CSUM) |
| 177 | skb->ip_summed = rcv_priv->ip_summed; | 177 | skb->ip_summed = rcv_priv->ip_summed; |
| 178 | 178 | ||
| 179 | dst_release(skb->dst); | ||
| 180 | skb->dst = NULL; | ||
| 181 | skb->mark = 0; | 179 | skb->mark = 0; |
| 182 | secpath_reset(skb); | 180 | secpath_reset(skb); |
| 183 | nf_reset(skb); | 181 | nf_reset(skb); |