diff options
| author |   Mark Brown <broonie@linaro.org> | 2014-05-05 12:27:30 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-05 12:27:30 -0700 |
| commit | af46929e6ee7197dfe315af3c5bb5cc75a0aec9c (patch) | |
| tree | 18359b934daf8c7e271930c938bd867a379cace7 /net/core/dst.c | |
| parent | ASoC: fsl_spdif: Use clk_set_rate() for spdif root clock only (diff) | |
| parent | Linux 3.15-rc4 (diff) | |
| download | wireguard-linux-af46929e6ee7197dfe315af3c5bb5cc75a0aec9c.tar.xz wireguard-linux-af46929e6ee7197dfe315af3c5bb5cc75a0aec9c.zip | |
Merge tag 'v3.15-rc4' into asoc-fsl-spdif
Linux 3.15-rc4
Diffstat (limited to '')
| -rw-r--r-- | net/core/dst.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/net/core/dst.c b/net/core/dst.c index ca4231ec7347..80d6286c8b62 100644 --- a/net/core/dst.c +++ b/net/core/dst.c @@ -142,12 +142,12 @@ loop: mutex_unlock(&dst_gc_mutex); } -int dst_discard(struct sk_buff *skb) +int dst_discard_sk(struct sock *sk, struct sk_buff *skb) { kfree_skb(skb); return 0; } -EXPORT_SYMBOL(dst_discard); +EXPORT_SYMBOL(dst_discard_sk); const u32 dst_default_metrics[RTAX_MAX + 1] = { /* This initializer is needed to force linker to place this variable @@ -184,7 +184,7 @@ void *dst_alloc(struct dst_ops *ops, struct net_device *dev, dst->xfrm = NULL; #endif dst->input = dst_discard; - dst->output = dst_discard; + dst->output = dst_discard_sk; dst->error = 0; dst->obsolete = initial_obsolete; dst->header_len = 0; @@ -209,8 +209,10 @@ static void ___dst_free(struct dst_entry *dst) /* The first case (dev==NULL) is required, when protocol module is unloaded. */ - if (dst->dev == NULL || !(dst->dev->flags&IFF_UP)) - dst->input = dst->output = dst_discard; + if (dst->dev == NULL || !(dst->dev->flags&IFF_UP)) { + dst->input = dst_discard; + dst->output = dst_discard_sk; + } dst->obsolete = DST_OBSOLETE_DEAD; } @@ -361,7 +363,8 @@ static void dst_ifdown(struct dst_entry *dst, struct net_device *dev, return; if (!unregister) { - dst->input = dst->output = dst_discard; + dst->input = dst_discard; + dst->output = dst_discard_sk; } else { dst->dev = dev_net(dst->dev)->loopback_dev; dev_hold(dst->dev); |