diff options
| author | David S. Miller | 2008-11-12 00:43:02 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-11-12 00:43:02 +0100 |
| commit | 7e452baf6b96b5aeba097afd91501d33d390cc97 (patch) | |
| tree | 9b0e062d3677d50d731ffd0fba47423bfdee9253 /net/dsa/tag_dsa.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| parent | Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | kernel-qcow2-linux-7e452baf6b96b5aeba097afd91501d33d390cc97.tar.gz kernel-qcow2-linux-7e452baf6b96b5aeba097afd91501d33d390cc97.tar.xz kernel-qcow2-linux-7e452baf6b96b5aeba097afd91501d33d390cc97.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/message/fusion/mptlan.c
drivers/net/sfc/ethtool.c
net/mac80211/debugfs_sta.c
Diffstat (limited to 'net/dsa/tag_dsa.c')
| -rw-r--r-- | net/dsa/tag_dsa.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c index ff55823a6534..f99a019b939e 100644 --- a/net/dsa/tag_dsa.c +++ b/net/dsa/tag_dsa.c @@ -159,6 +159,7 @@ static int dsa_rcv(struct sk_buff *skb, struct net_device *dev, skb->dev = ds->ports[source_port]; skb_push(skb, ETH_HLEN); + skb->pkt_type = PACKET_HOST; skb->protocol = eth_type_trans(skb, skb->dev); skb->dev->stats.rx_packets++; |