projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[powerpc.git]
/
include
/
net
/
x25device.h
diff --git
a/include/net/x25device.h
b/include/net/x25device.h
index
1a31837
..
1d10c87
100644
(file)
--- a/
include/net/x25device.h
+++ b/
include/net/x25device.h
@@
-8,6
+8,7
@@
static inline __be16 x25_type_trans(struct sk_buff *skb, struct net_device *dev)
{
skb->mac.raw = skb->data;
+ skb->dev = dev;
skb->pkt_type = PACKET_HOST;
return htons(ETH_P_X25);