diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-16 22:17:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-16 22:17:37 -0400 |
| commit | 028940342a906db8da014a7603a0deddc2c323dd (patch) | |
| tree | 688dbc38a3e218f2493d311b1d70a67668837347 /drivers/net/macvlan.c | |
| parent | be3eed2e96340d3c7a4d1ea1d63e7bd6095d1e34 (diff) | |
| parent | 0e93b4b304ae052ba1bc73f6d34a68556fe93429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/macvlan.c')
| -rw-r--r-- | drivers/net/macvlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index ebacec1944ed..66a9bfe7b1c8 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c | |||
| @@ -258,7 +258,7 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 258 | 258 | ||
| 259 | xmit_world: | 259 | xmit_world: |
| 260 | skb->ip_summed = ip_summed; | 260 | skb->ip_summed = ip_summed; |
| 261 | skb_set_dev(skb, vlan->lowerdev); | 261 | skb->dev = vlan->lowerdev; |
| 262 | return dev_queue_xmit(skb); | 262 | return dev_queue_xmit(skb); |
| 263 | } | 263 | } |
| 264 | 264 | ||