diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /net/netrom/nr_dev.c | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'net/netrom/nr_dev.c')
| -rw-r--r-- | net/netrom/nr_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c index 4e66eef9a034..509afddae569 100644 --- a/net/netrom/nr_dev.c +++ b/net/netrom/nr_dev.c | |||
| @@ -58,7 +58,7 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev) | |||
| 58 | 58 | ||
| 59 | /* Spoof incoming device */ | 59 | /* Spoof incoming device */ |
| 60 | skb->dev = dev; | 60 | skb->dev = dev; |
| 61 | skb->h.raw = skb->data; | 61 | skb->mac.raw = skb->nh.raw; |
| 62 | skb->nh.raw = skb->data; | 62 | skb->nh.raw = skb->data; |
| 63 | skb->pkt_type = PACKET_HOST; | 63 | skb->pkt_type = PACKET_HOST; |
| 64 | 64 | ||