diff options
author | David S. Miller <davem@davemloft.net> | 2012-05-17 04:17:37 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-17 04:17:37 +0200 |
commit | 028940342a906db8da014a7603a0deddc2c323dd (patch) | |
tree | 688dbc38a3e218f2493d311b1d70a67668837347 /net/8021q/vlan_dev.c | |
parent | netfilter: nf_ct_h323: fix usage of MODULE_ALIAS_NFCT_HELPER (diff) | |
parent | Merge git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
download | linux-028940342a906db8da014a7603a0deddc2c323dd.tar.xz linux-028940342a906db8da014a7603a0deddc2c323dd.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/8021q/vlan_dev.c')
-rw-r--r-- | net/8021q/vlan_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index eaf5f21b0ef7..da1bc9c3cf38 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -157,7 +157,7 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb, skb = __vlan_hwaccel_put_tag(skb, vlan_tci); } - skb_set_dev(skb, vlan_dev_priv(dev)->real_dev); + skb->dev = vlan_dev_priv(dev)->real_dev; len = skb->len; if (netpoll_tx_running(dev)) return skb->dev->netdev_ops->ndo_start_xmit(skb, skb->dev); |